From 18f28395e860384ab622d05ddf6bba316278079d Mon Sep 17 00:00:00 2001
From: Martin Trojer <mtrojer@fb.com>
Date: Fri, 12 Mar 2021 04:40:25 -0800
Subject: [PATCH] [clang] migrate to llvm/clang11

Summary:
Update Infer to LLVM (clang) 11.1.0.

Infer/clang now uses the LLVM 'monorepo' release, simplifying the download script.
Some changes done to how/when ASTExporter mangles names, this to avoid the
plugin hitting asserts in the clang code when mangling names.

Reviewed By: jvillard

Differential Revision: D27006986

fbshipit-source-id: 4d4b6ba05
---
 .../clang-ocaml/tests/clang_ast_main_test.exp |   48 +-
 facebook-clang-plugins/clang/setup.sh         |    5 +-
 .../clang/src/AArch64SVEACLETypes.patch       |   15 +
 .../clang/src/err_ret_local_block.patch       |    4 +-
 .../clang/src/mangle_suppress_errors.patch    |    4 +-
 .../clang/src/prepare_clang_src.sh            |   82 +-
 .../clang/src/template_ambiguous.patch        |   12 -
 .../libtooling/ASTExporter.h                  |  132 +-
 .../libtooling/FileUtils.cpp                  |    6 +-
 .../libtooling/NamePrinter.h                  |    6 +-
 .../libtooling/SimplePluginASTAction.cpp      |    2 +-
 .../tests/BiniouASTExporter/Hello.m.exp       |  425 ++--
 .../ObjCBridgeTransferTest.m.exp              |  367 +--
 .../tests/BiniouASTExporter/ObjCTest.m.exp    | 2017 ++++++++--------
 .../available_expression.m.exp                |   43 +-
 .../BiniouASTExporter/bind_temporary.cpp.exp  |   39 +-
 .../BiniouASTExporter/c_attributes.c.exp      |   27 +-
 .../tests/BiniouASTExporter/c_cast.cpp.exp    |   27 +-
 .../BiniouASTExporter/class_template.cpp.exp  |  103 +-
 .../tests/BiniouASTExporter/comments.c.exp    |   27 +-
 .../BiniouASTExporter/const_cast.cpp.exp      |   31 +-
 .../BiniouASTExporter/dynamic_cast.cpp.exp    |   63 +-
 .../expr_with_cleanups.cpp.exp                |   55 +-
 .../tests/BiniouASTExporter/friend.cpp.exp    |   79 +-
 .../function_template.cpp.exp                 |   55 +-
 .../generic_selector_expression.c.exp         |   27 +-
 .../BiniouASTExporter/inheritance.cpp.exp     |   59 +-
 .../inheriting_constructor.cpp.exp            |   57 +-
 .../tests/BiniouASTExporter/lambda.cpp.exp    |  123 +-
 .../materialize_temporary.cpp.exp             |   27 +-
 .../BiniouASTExporter/namespace_decl.cpp.exp  |   27 +-
 .../tests/BiniouASTExporter/new.cpp.exp       |  569 ++---
 .../BiniouASTExporter/no_except_expr.cpp.exp  |   33 +-
 .../objcpp_template_unboxing.mm.exp           |   43 +-
 .../tests/BiniouASTExporter/optional.m.exp    |   47 +-
 .../sizeof_static_evaluation.cpp.exp          |   43 +-
 .../tests/BiniouASTExporter/struct.cpp.exp    |   39 +-
 .../template_instantiations.cpp.exp           |  253 +-
 .../tests/BiniouASTExporter/this.cpp.exp      |   27 +-
 .../BiniouASTExporter/type_trait.cpp.exp      |   51 +-
 .../unresolved_lookup.cpp.exp                 |   49 +-
 .../BiniouASTExporter/using_directive.cpp.exp |   27 +-
 .../BiniouASTExporter/virtual_bases.cpp.exp   |  107 +-
 .../tests/JsonASTExporter/Hello.m.exp         |  496 ++--
 .../ObjCBridgeTransferTest.m.exp              |  450 ++--
 .../tests/JsonASTExporter/ObjCTest.m.exp      | 2116 +++++++++--------
 .../JsonASTExporter/bind_temporary.cpp.exp    |   54 +-
 .../tests/JsonASTExporter/c_attributes.c.exp  |   42 +-
 .../tests/JsonASTExporter/c_cast.cpp.exp      |   42 +-
 .../JsonASTExporter/class_template.cpp.exp    |  130 +-
 .../tests/JsonASTExporter/comments.c.exp      |   42 +-
 .../tests/JsonASTExporter/const_cast.cpp.exp  |   46 +-
 .../JsonASTExporter/dynamic_cast.cpp.exp      |   78 +-
 .../expr_with_cleanups.cpp.exp                |   70 +-
 .../tests/JsonASTExporter/friend.cpp.exp      |  114 +-
 .../JsonASTExporter/function_template.cpp.exp |   80 +-
 .../tests/JsonASTExporter/inheritance.cpp.exp |   74 +-
 .../inheriting_constructor.cpp.exp            |   74 +-
 .../tests/JsonASTExporter/lambda.cpp.exp      |  146 +-
 .../materialize_temporary.cpp.exp             |   42 +-
 .../JsonASTExporter/namespace_decl.cpp.exp    |   42 +-
 .../tests/JsonASTExporter/new.cpp.exp         |  664 +++---
 .../JsonASTExporter/no_except_expr.cpp.exp    |   52 +-
 .../objcpp_template_unboxing.mm.exp           |   58 +-
 .../tests/JsonASTExporter/optional.m.exp      |   60 +-
 .../sizeof_static_evaluation.cpp.exp          |   62 +-
 .../tests/JsonASTExporter/struct.cpp.exp      |   54 +-
 .../template_instantiations.cpp.exp           |  294 +--
 .../tests/JsonASTExporter/this.cpp.exp        |   42 +-
 .../tests/JsonASTExporter/type_trait.cpp.exp  |   68 +-
 .../JsonASTExporter/unresolved_lookup.cpp.exp |   80 +-
 .../JsonASTExporter/using_directive.cpp.exp   |   42 +-
 .../JsonASTExporter/virtual_bases.cpp.exp     |  122 +-
 .../tests/YojsonASTExporter/Hello.m.exp       |  496 ++--
 .../ObjCBridgeTransferTest.m.exp              |  450 ++--
 .../tests/YojsonASTExporter/ObjCTest.m.exp    | 2116 +++++++++--------
 .../available_expression.m.exp                |   56 +-
 .../YojsonASTExporter/bind_temporary.cpp.exp  |   54 +-
 .../YojsonASTExporter/c_attributes.c.exp      |   42 +-
 .../tests/YojsonASTExporter/c_cast.cpp.exp    |   42 +-
 .../YojsonASTExporter/class_template.cpp.exp  |  130 +-
 .../tests/YojsonASTExporter/comments.c.exp    |   42 +-
 .../YojsonASTExporter/const_cast.cpp.exp      |   46 +-
 .../YojsonASTExporter/dynamic_cast.cpp.exp    |   78 +-
 .../expr_with_cleanups.cpp.exp                |   70 +-
 .../tests/YojsonASTExporter/friend.cpp.exp    |  114 +-
 .../function_template.cpp.exp                 |   80 +-
 .../generic_selector_expression.c.exp         |   42 +-
 .../YojsonASTExporter/inheritance.cpp.exp     |   74 +-
 .../inheriting_constructor.cpp.exp            |   74 +-
 .../tests/YojsonASTExporter/lambda.cpp.exp    |  146 +-
 .../materialize_temporary.cpp.exp             |   42 +-
 .../YojsonASTExporter/namespace_decl.cpp.exp  |   42 +-
 .../tests/YojsonASTExporter/new.cpp.exp       |  664 +++---
 .../YojsonASTExporter/no_except_expr.cpp.exp  |   52 +-
 .../objcpp_template_unboxing.mm.exp           |   58 +-
 .../tests/YojsonASTExporter/optional.m.exp    |   60 +-
 .../sizeof_static_evaluation.cpp.exp          |   62 +-
 .../tests/YojsonASTExporter/struct.cpp.exp    |   54 +-
 .../template_instantiations.cpp.exp           |  294 +--
 .../tests/YojsonASTExporter/this.cpp.exp      |   42 +-
 .../YojsonASTExporter/type_trait.cpp.exp      |   68 +-
 .../unresolved_lookup.cpp.exp                 |   80 +-
 .../YojsonASTExporter/using_directive.cpp.exp |   42 +-
 infer/src/clang/CType_decl.ml                 |    1 +
 infer/src/clang/ClangCommand.ml               |    2 +-
 infer/src/clang/cFrontend_decl.ml             |    1 +
 infer/src/clang/cTrans.ml                     |    7 +
 .../cpp/frontend/constructors.cpp.dot         |   30 +-
 .../frontend/destructors/break_scope.cpp.dot  |  124 +-
 .../destructors/call_on_delete.cpp.dot        |   16 +-
 .../destructors/continue_scope.cpp.dot        |  124 +-
 .../destructors/destructor_bases.cpp.dot      |  310 +--
 .../cpp/frontend/destructors/scope.cpp.dot    |  146 +-
 .../frontend/destructors/simple_decl.cpp.dot  |   40 +-
 .../frontend/globals/global_const1.cpp.dot    |   12 +-
 .../include_header/include_templ.cpp.dot      |   12 +-
 .../inheriting_constructor.cpp.dot            |   20 +-
 .../frontend/initialization/init_list.cpp.dot |  100 +-
 .../frontend/initialization/zero_init.cpp.dot |   28 +-
 .../cpp/frontend/loops/foreach1.cpp.dot       |   64 +-
 .../frontend/nestedoperators/union.cpp.dot    |    6 +-
 .../tests/codetoanalyze/cpp/pulse/values.cpp  |    2 +-
 .../codetoanalyze/cpp/quandary/issues.exp     |    4 +-
 .../cpp/shared/attributes/annotate.cpp.dot    |   10 +-
 .../conditional/binary_conditional.cpp.dot    |   18 +-
 .../constructors/constructor_array.cpp.dot    |   58 +-
 .../constructor_default_arg.cpp.dot           |   10 +-
 .../constructors/constructor_init.cpp.dot     |   76 +-
 .../constructors/constructor_new.cpp.dot      |   38 +-
 .../constructor_struct_init_list.cpp.dot      |   14 +-
 .../constructor_with_body.cpp.dot             |   28 +-
 .../constructors/copy_array_field.cpp.dot     |   28 +-
 .../copy_move_constructor.cpp.dot             |   68 +-
 .../constructors/default_field_init.cpp.dot   |   90 +-
 .../shared/constructors/std_init_list.cpp.dot |   36 +-
 .../shared/constructors/temp_object.cpp.dot   |   30 +-
 .../cpp/shared/lambda/lambda1.cpp.dot         |  310 +--
 .../cpp/shared/methods/byvals.cpp.dot         |   42 +-
 .../methods/conversion_operator.cpp.dot       |   34 +-
 .../cpp/shared/methods/return_struct.cpp.dot  |   20 +-
 .../shared/methods/virtual_methods.cpp.dot    |   54 +-
 .../cpp/shared/namespace/namespace.cpp.dot    |   18 +-
 .../member_access_from_return.cpp.dot         |    6 +-
 .../cpp/shared/reference/ptr_mem.cpp.dot      |   28 +-
 .../shared/reference/reference_field.cpp.dot  |   86 +-
 .../reference/reference_struct_e2e.cpp.dot    |    6 +-
 .../templates/class_specialization.cpp.dot    |   60 +-
 .../class_template_instantiate.cpp.dot        |   28 +-
 .../cpp/shared/templates/function.cpp.dot     |   12 +-
 .../cpp/shared/templates/method.cpp.dot       |   80 +-
 .../cpp/shared/types/inheritance.cpp.dot      |   20 +-
 .../shared/types/inheritance_casts.cpp.dot    |   48 +-
 .../cpp/shared/types/return_struct.cpp.dot    |   20 +-
 .../types/struct_forward_declare.cpp.dot      |   12 +-
 .../shared/types/struct_pass_by_value.cpp.dot |   56 +-
 .../frontend/global_const/global_const.mm.dot |   30 +-
 157 files changed, 9940 insertions(+), 9313 deletions(-)
 create mode 100644 facebook-clang-plugins/clang/src/AArch64SVEACLETypes.patch
 delete mode 100644 facebook-clang-plugins/clang/src/template_ambiguous.patch

diff --git a/facebook-clang-plugins/clang-ocaml/tests/clang_ast_main_test.exp b/facebook-clang-plugins/clang-ocaml/tests/clang_ast_main_test.exp
index 14fb21029..0c719b412 100644
--- a/facebook-clang-plugins/clang-ocaml/tests/clang_ast_main_test.exp
+++ b/facebook-clang-plugins/clang-ocaml/tests/clang_ast_main_test.exp
@@ -1,4 +1,4 @@
-9 0 75 
+9 0 76 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -8,7 +8,7 @@ TranslationUnitDecl None:None:None None:None:None
   FunctionDecl tests/c_attributes.c:7:1 tests/c_attributes.c:7:60
      ParmVarDecl tests/c_attributes.c:7:18 tests/c_attributes.c:7:22
   TypedefDecl tests/c_attributes.c:7:22 tests/c_attributes.c:7:22
-16 9 84 
+16 9 85 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -39,7 +39,7 @@ TranslationUnitDecl None:None:None None:None:None
                 CXXBindTemporaryExpr
                   CXXTemporaryObjectExpr
   TypedefDecl tests/bind_temporary.cpp:13:22 tests/bind_temporary.cpp:13:22
-10 9 76 
+10 9 77 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -59,7 +59,7 @@ TranslationUnitDecl None:None:None None:None:None
         ImplicitCastExpr
           DeclRefExpr
   TypedefDecl tests/c_cast.cpp:9:15 tests/c_cast.cpp:9:15
-15 9 83 
+15 9 84 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -86,7 +86,7 @@ TranslationUnitDecl None:None:None None:None:None
   VarDecl tests/const_cast.cpp:17:1 tests/const_cast.cpp:17:19
     IntegerLiteral
   TypedefDecl tests/const_cast.cpp:17:19 tests/const_cast.cpp:17:19
-44 40 111 
+44 40 112 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -197,7 +197,7 @@ TranslationUnitDecl None:None:None None:None:None
               ImplicitCastExpr
                 DeclRefExpr
   TypedefDecl tests/dynamic_cast.cpp:24:30 tests/dynamic_cast.cpp:24:30
-33 54 98 
+33 54 99 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -319,7 +319,7 @@ TranslationUnitDecl None:None:None None:None:None
                       ImplicitCastExpr
                         DeclRefExpr
   TypedefDecl tests/expr_with_cleanups.cpp:25:9 tests/expr_with_cleanups.cpp:25:9
-41 57 104 
+41 57 105 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -418,7 +418,7 @@ TranslationUnitDecl None:None:None None:None:None
        ParmVarDecl tests/inheritance.cpp:23:7 tests/inheritance.cpp:23:7
     CXXDestructorDecl tests/inheritance.cpp:23:7 tests/inheritance.cpp:23:7
   TypedefDecl tests/inheritance.cpp:23:7 tests/inheritance.cpp:23:7
-41 48 131 
+41 48 132 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -601,7 +601,7 @@ TranslationUnitDecl None:None:None None:None:None
       ReturnStmt
         IntegerLiteral
   TypedefDecl tests/lambda.cpp:16:10 tests/lambda.cpp:16:10
-8 4 77 
+8 4 78 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -614,7 +614,7 @@ TranslationUnitDecl None:None:None None:None:None
         ImplicitCastExpr
           FloatingLiteral
   TypedefDecl tests/materialize_temporary.cpp:7:16 tests/materialize_temporary.cpp:7:16
-14 0 76 
+14 0 77 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -629,7 +629,7 @@ TranslationUnitDecl None:None:None None:None:None
   NamespaceDecl tests/namespace_decl.cpp:17:1 tests/namespace_decl.cpp:19:1
   UsingDirectiveDecl tests/namespace_decl.cpp:17:11 tests/namespace_decl.cpp:17:11
   TypedefDecl tests/namespace_decl.cpp:17:11 tests/namespace_decl.cpp:17:11
-58 98 139 
+58 98 140 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -837,7 +837,7 @@ TranslationUnitDecl None:None:None None:None:None
               UnaryOperator
                 DeclRefExpr
   TypedefDecl tests/new.cpp:51:24 tests/new.cpp:51:24
-28 10 89 
+28 10 90 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -877,7 +877,7 @@ TranslationUnitDecl None:None:None None:None:None
     VarDecl tests/struct.cpp:25:3 tests/struct.cpp:25:24
       IntegerLiteral
   TypedefDecl tests/struct.cpp:25:24 tests/struct.cpp:25:24
-11 5 79 
+11 5 80 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -894,7 +894,7 @@ TranslationUnitDecl None:None:None None:None:None
             CXXThisExpr
           IntegerLiteral
   TypedefDecl tests/this.cpp:9:28 tests/this.cpp:9:28
-8 0 89 
+8 0 90 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -903,7 +903,7 @@ TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   ClassTemplateDecl tests/unresolved_lookup.cpp:7:1 tests/unresolved_lookup.cpp:12:1
   TypedefDecl tests/unresolved_lookup.cpp:12:1 tests/unresolved_lookup.cpp:12:1
-13 2 76 
+13 2 77 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -919,7 +919,7 @@ TranslationUnitDecl None:None:None None:None:None
     ImplicitCastExpr
       DeclRefExpr
   TypedefDecl tests/using_directive.cpp:14:9 tests/using_directive.cpp:14:9
-36 23 125 
+36 23 126 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -980,7 +980,7 @@ TranslationUnitDecl None:None:None None:None:None
           ImplicitCastExpr
             DeclRefExpr
   TypedefDecl tests/class_template.cpp:25:15 tests/class_template.cpp:25:15
-19 35 97 
+19 35 98 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -1035,7 +1035,7 @@ TranslationUnitDecl None:None:None None:None:None
           ImplicitCastExpr
             DeclRefExpr
   TypedefDecl tests/function_template.cpp:26:11 tests/function_template.cpp:26:11
-20 13 93 
+20 13 94 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -1069,7 +1069,7 @@ TranslationUnitDecl None:None:None None:None:None
       ImplicitCastExpr
         DeclRefExpr
   TypedefDecl tests/type_trait.cpp:18:18 tests/type_trait.cpp:18:18
-10 8 82 
+10 8 83 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -1088,7 +1088,7 @@ TranslationUnitDecl None:None:None None:None:None
               ImplicitCastExpr
                 DeclRefExpr
   TypedefDecl tests/no_except_expr.cpp:9:30 tests/no_except_expr.cpp:9:30
-21 2 113 
+21 2 114 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -1112,7 +1112,7 @@ TranslationUnitDecl None:None:None None:None:None
   VarDecl tests/friend.cpp:18:1 tests/friend.cpp:18:8
     CXXConstructExpr
   TypedefDecl tests/friend.cpp:18:8 tests/friend.cpp:18:8
-86 37 115 
+86 37 116 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -1237,7 +1237,7 @@ TranslationUnitDecl None:None:None None:None:None
       ReturnStmt
         IntegerLiteral
   TypedefDecl tests/Hello.m:28:10 tests/Hello.m:28:10
-176 193 139 
+176 193 140 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -1758,7 +1758,7 @@ TranslationUnitDecl None:None:None None:None:None
       ReturnStmt
         IntegerLiteral
   TypedefDecl tests/ObjCTest.m:111:10 tests/ObjCTest.m:111:10
-82 8 118 
+82 8 119 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
@@ -1855,7 +1855,7 @@ TranslationUnitDecl None:None:None None:None:None
                     ImplicitCastExpr
                       DeclRefExpr
   TypedefDecl tests/ObjCBridgeTransferTest.m:24:51 tests/ObjCBridgeTransferTest.m:24:51
-12 0 84 
+12 0 85 
 TranslationUnitDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
   TypedefDecl None:None:None None:None:None
diff --git a/facebook-clang-plugins/clang/setup.sh b/facebook-clang-plugins/clang/setup.sh
index 2ab130629..a7c695802 100755
--- a/facebook-clang-plugins/clang/setup.sh
+++ b/facebook-clang-plugins/clang/setup.sh
@@ -10,12 +10,12 @@ set -e
 set -o pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-CLANG_RELATIVE_SRC="src/download/llvm"
+CLANG_RELATIVE_SRC="src/download/llvm-project/llvm"
 CLANG_SRC="$SCRIPT_DIR/$CLANG_RELATIVE_SRC"
 CLANG_PREBUILD_PATCHES=(
     "$SCRIPT_DIR/src/err_ret_local_block.patch"
     "$SCRIPT_DIR/src/mangle_suppress_errors.patch"
-    "$SCRIPT_DIR/src/template_ambiguous.patch"
+    "$SCRIPT_DIR/src/AArch64SVEACLETypes.patch"
 )
 CLANG_PREFIX="$SCRIPT_DIR/install"
 CLANG_INSTALLED_VERSION_FILE="$SCRIPT_DIR/installed.version"
@@ -164,6 +164,7 @@ CMAKE_ARGS=(
   -DLLVM_ENABLE_EH=On
   -DLLVM_ENABLE_RTTI=On
   -DLLVM_INCLUDE_DOCS=Off
+  -DLLVM_ENABLE_PROJECTS="clang;compiler-rt;libcxx;libcxxabi;openmp"
   -DLLVM_TARGETS_TO_BUILD="X86;AArch64;ARM;Mips"
   -DLLVM_BUILD_EXTERNAL_COMPILER_RT=On
 )
diff --git a/facebook-clang-plugins/clang/src/AArch64SVEACLETypes.patch b/facebook-clang-plugins/clang/src/AArch64SVEACLETypes.patch
new file mode 100644
index 000000000..ad3474e1c
--- /dev/null
+++ b/facebook-clang-plugins/clang/src/AArch64SVEACLETypes.patch
@@ -0,0 +1,15 @@
+--- a/llvm-project/clang/include/clang/Basic/AArch64SVEACLETypes.def
++++ b/llvm-project/clang/include/clang/Basic/AArch64SVEACLETypes.def
+@@ -12,10 +12,10 @@
+ //    covered by any other #define.  Defining this macro covers all
+ //    the builtins.
+ //
+-//    SVE_VECTOR_TYPE(Name, Id, SingletonId, ElKind, ElBits, IsSigned, IsFP) -
++//    SVE_VECTOR_TYPE(Name, MangledName, Id, SingletonId, NumEls, ElBits, IsSigned, IsFP, IsBF) -
+ //    An SVE scalable vector.
+ //
+-//    SVE_PREDICATE_TYPE(Name, Id, SingletonId, ElKind) - An SVE scalable
++//    SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId, NumEls) - An SVE scalable
+ //    predicate.
+ //
+ // where:
diff --git a/facebook-clang-plugins/clang/src/err_ret_local_block.patch b/facebook-clang-plugins/clang/src/err_ret_local_block.patch
index 569f37bf8..d92975896 100644
--- a/facebook-clang-plugins/clang/src/err_ret_local_block.patch
+++ b/facebook-clang-plugins/clang/src/err_ret_local_block.patch
@@ -1,5 +1,5 @@
---- a/llvm/tools/clang/lib/Sema/SemaInit.cpp
-+++ b/llvm/tools/clang/lib/Sema/SemaInit.cpp
+--- a/llvm-project/clang/lib/Sema/SemaInit.cpp
++++ b/llvm-project/clang/lib/Sema/SemaInit.cpp
 @@ -7147,7 +7147,9 @@ void Sema::checkInitializerLifetime(const InitializedEntity &Entity,
              << Entity.getType()->isReferenceType() << DRE->getDecl()
              << isa<ParmVarDecl>(DRE->getDecl()) << DiagRange;
diff --git a/facebook-clang-plugins/clang/src/mangle_suppress_errors.patch b/facebook-clang-plugins/clang/src/mangle_suppress_errors.patch
index 912842d9c..c68666271 100644
--- a/facebook-clang-plugins/clang/src/mangle_suppress_errors.patch
+++ b/facebook-clang-plugins/clang/src/mangle_suppress_errors.patch
@@ -1,5 +1,5 @@
---- a/llvm/tools/clang/lib/AST/ItaniumMangle.cpp
-+++ b/llvm/tools/clang/lib/AST/ItaniumMangle.cpp
+--- a/llvm-project/clang/lib/AST/ItaniumMangle.cpp
++++ b/llvm-project/clang/lib/AST/ItaniumMangle.cpp
 @@ -3048,11 +3048,7 @@ void CXXNameMangler::mangleNeonVectorType(const VectorType *T) {
  }
 
diff --git a/facebook-clang-plugins/clang/src/prepare_clang_src.sh b/facebook-clang-plugins/clang/src/prepare_clang_src.sh
index 3c50950d4..33a801ecb 100755
--- a/facebook-clang-plugins/clang/src/prepare_clang_src.sh
+++ b/facebook-clang-plugins/clang/src/prepare_clang_src.sh
@@ -12,84 +12,22 @@ set -o pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 SHASUM=${SHASUM:-shasum -a 256}
 
-LLVM_VER="10.0.1"
-
-GITHUB_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}"
-
-LLVM_FILE="llvm-${LLVM_VER}.src.tar.xz"
-CLANG_FILE="clang-${LLVM_VER}.src.tar.xz"
-COMPILER_RT_FILE="compiler-rt-${LLVM_VER}.src.tar.xz"
-LIBCXX_FILE="libcxx-${LLVM_VER}.src.tar.xz"
-LIBCXXABI_FILE="libcxxabi-${LLVM_VER}.src.tar.xz"
-OPENMP_FILE="openmp-${LLVM_VER}.src.tar.xz"
-
-LLVM_URL="${GITHUB_URL}/${LLVM_FILE}"
-CLANG_URL="${GITHUB_URL}/${CLANG_FILE}"
-COMPILER_RT_URL="${GITHUB_URL}/${COMPILER_RT_FILE}"
-LIBCXX_URL="${GITHUB_URL}/${LIBCXX_FILE}"
-LIBCXXABI_URL="${GITHUB_URL}/${LIBCXXABI_FILE}"
-OPENMP_URL="${GITHUB_URL}/${OPENMP_FILE}"
-
-LLVM_SHA="c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3"
-CLANG_SHA="f99afc382b88e622c689b6d96cadfa6241ef55dca90e87fc170352e12ddb2b24"
-COMPILER_RT_SHA="d90dc8e121ca0271f0fd3d639d135bfaa4b6ed41e67bd6eb77808f72629658fa"
-LIBCXX_SHA="def674535f22f83131353b3c382ccebfef4ba6a35c488bdb76f10b68b25be86c"
-LIBCXXABI_SHA="a97ef810b2e9fb70e8f7e317b74e646ed4944f488b02ac5ddd9c99e385381a7b"
-OPENMP_SHA="d19f728c8e04fb1e94566c8d76aef50ec926cd2f95ef3bf1e0a5de4909b28b44"
-
-FILES=(
-    $LLVM_FILE
-    $CLANG_FILE
-    $COMPILER_RT_FILE
-    $LIBCXX_FILE
-    $LIBCXXABI_FILE
-    $OPENMP_FILE
-)
-
-URLS=(
-    $LLVM_URL
-    $CLANG_URL
-    $COMPILER_RT_URL
-    $LIBCXX_URL
-    $LIBCXXABI_URL
-    $OPENMP_URL
-)
-
-SHAS=(
-    $LLVM_SHA
-    $CLANG_SHA
-    $COMPILER_RT_SHA
-    $LIBCXX_SHA
-    $LIBCXXABI_SHA
-    $OPENMP_SHA
-)
+LLVM_VER="11.1.0"
+LLVM_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/llvm-project-${LLVM_VER}.src.tar.xz"
+LLVM_SHA="74d2529159fd118c3eac6f90107b5611bccc6f647fdea104024183e8d5e25831"
+LLVM_FILE="llvm-project.src.tar.xz"
 
 mkdir -p "${SCRIPT_DIR}/download"
 pushd "${SCRIPT_DIR}/download" >/dev/null
 
-for i in ${!URLS[@]}; do
-    if [ ! -f "${FILES[$i]}" ]; then
-        curl -L "${URLS[$i]}" --output "${FILES[$i]}"
-    fi
-    echo "${SHAS[$i]}  ${FILES[$i]}" | $SHASUM -c
-done
+if [ ! -f "${LLVM_FILE}" ]; then
+    curl -L "${LLVM_URL}" --output "${LLVM_FILE}"
+fi
+echo "${LLVM_SHA}  ${LLVM_FILE}" | $SHASUM -c
 
-rm -rf "llvm-${LLVM_VER}.src" "llvm"
+rm -rf "llvm-project-${LLVM_VER}.src" "llvm-project"
 
 tar xf "${LLVM_FILE}"
-cd "llvm-${LLVM_VER}.src/tools"
-tar xf "../../${CLANG_FILE}"
-mv "clang-${LLVM_VER}.src" clang
-cd ../projects
-tar xf "../../${COMPILER_RT_FILE}"
-mv "compiler-rt-${LLVM_VER}.src" compiler-rt
-tar xf "../../${LIBCXX_FILE}"
-mv "libcxx-${LLVM_VER}.src" libcxx
-tar xf "../../${LIBCXXABI_FILE}"
-mv "libcxxabi-${LLVM_VER}.src" libcxxabi
-tar xf "../../${OPENMP_FILE}"
-mv "openmp-${LLVM_VER}.src" openmp
-cd ../..
-mv "llvm-${LLVM_VER}.src" llvm
+mv "llvm-project-${LLVM_VER}.src" "llvm-project"
 
 popd >/dev/null
diff --git a/facebook-clang-plugins/clang/src/template_ambiguous.patch b/facebook-clang-plugins/clang/src/template_ambiguous.patch
deleted file mode 100644
index 2d798ca56..000000000
--- a/facebook-clang-plugins/clang/src/template_ambiguous.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/llvm/tools/clang/lib/Sema/SemaTemplate.cpp
-+++ b/llvm/tools/clang/lib/Sema/SemaTemplate.cpp
-@@ -441,9 +441,6 @@ bool Sema::LookupTemplateName(LookupResult &Found,
-     IsDependent |= Found.wasNotFoundInCurrentInstantiation();
-   }
-
--  if (Found.isAmbiguous())
--    return false;
--
-   if (ATK && !SS.isSet() && ObjectType.isNull() && TemplateKWLoc.isInvalid()) {
-     // C++2a [temp.names]p2:
-     //   A name is also considered to refer to a template if it is an
diff --git a/facebook-clang-plugins/libtooling/ASTExporter.h b/facebook-clang-plugins/libtooling/ASTExporter.h
index ed81579d1..76416765f 100644
--- a/facebook-clang-plugins/libtooling/ASTExporter.h
+++ b/facebook-clang-plugins/libtooling/ASTExporter.h
@@ -45,6 +45,7 @@
 #include <clang/AST/TypeVisitor.h>
 #include <clang/Basic/Module.h>
 #include <clang/Basic/SourceManager.h>
+#include <clang/Basic/TargetInfo.h>
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Frontend/FrontendDiagnostic.h>
 #include <clang/Frontend/FrontendPluginRegistry.h>
@@ -659,7 +660,7 @@ template <class ATDWriter>
 void ASTExporter<ATDWriter>::dumpDeclRef(const Decl &D) {
   const NamedDecl *ND = dyn_cast<NamedDecl>(&D);
   const ValueDecl *VD = dyn_cast<ValueDecl>(&D);
-  bool IsHidden = ND && ND->isHidden();
+  bool IsHidden = ND && !ND->isUnconditionallyVisible();
   ObjectScope Scope(OF, 2 + (bool)ND + (bool)VD + IsHidden);
 
   OF.emitTag("kind");
@@ -1103,7 +1104,7 @@ void ASTExporter<ATDWriter>::VisitDecl(const Decl *D) {
       M = D->getLocalOwningModule();
     }
     const NamedDecl *ND = dyn_cast<NamedDecl>(D);
-    bool IsNDHidden = ND && ND->isHidden();
+    bool IsNDHidden = ND && !ND->isUnconditionallyVisible();
     bool IsDImplicit = D->isImplicit();
     bool IsDUsed = D->isUsed();
     bool IsDReferenced = D->isThisDeclarationReferenced();
@@ -1535,7 +1536,10 @@ void ASTExporter<ATDWriter>::VisitFunctionDecl(const FunctionDecl *D) {
   ASTExporter<ATDWriter>::VisitDeclaratorDecl(D);
   // We purposedly do not call VisitDeclContext(D).
 
-  bool ShouldMangleName = Mangler->shouldMangleDeclName(D);
+  auto DNkind = D->getDeclName().getNameKind();
+  bool ShouldMangleName = Mangler->shouldMangleDeclName(D) &&
+                          DNkind != DeclarationName::CXXDeductionGuideName &&
+                          DNkind != DeclarationName::CXXUsingDirective;
   bool IsInlineSpecified = D->isInlineSpecified();
   bool IsModulePrivate = D->isModulePrivate();
   bool IsPure = D->isPure();
@@ -1567,13 +1571,15 @@ void ASTExporter<ATDWriter>::VisitFunctionDecl(const FunctionDecl *D) {
     OF.emitTag("mangled_name");
     SmallString<64> Buf;
     llvm::raw_svector_ostream StrOS(Buf);
+    GlobalDecl GD;
     if (const auto *CD = dyn_cast<CXXConstructorDecl>(D)) {
-      Mangler->mangleCXXCtor(CD, Ctor_Complete, StrOS);
+      GD = GlobalDecl(CD, Ctor_Base);
     } else if (const auto *DD = dyn_cast<CXXDestructorDecl>(D)) {
-      Mangler->mangleCXXDtor(DD, Dtor_Deleting, StrOS);
+      GD = GlobalDecl(DD, Dtor_Base);
     } else {
-      Mangler->mangleName(D, StrOS);
+      GD = GlobalDecl(D);
     }
+    Mangler->mangleName(GD, StrOS);
     // mangled names can get ridiculously long, so hash them to a fixed size
     OF.emitString(std::to_string(fnv64Hash(StrOS)));
   }
@@ -2060,7 +2066,8 @@ template <class ATDWriter>
 void ASTExporter<ATDWriter>::VisitClassTemplateSpecializationDecl(
     const ClassTemplateSpecializationDecl *D) {
   VisitCXXRecordDecl(D);
-  bool ShouldMangleName = Mangler->shouldMangleDeclName(D);
+  bool ShouldMangleName = Mangler->shouldMangleDeclName(D) &&
+                          (isa<FunctionDecl>(D) || isa<VarDecl>(D));
   if (ShouldMangleName) {
     SmallString<64> Buf;
     llvm::raw_svector_ostream StrOS(Buf);
@@ -2531,7 +2538,7 @@ void ASTExporter<ATDWriter>::VisitObjCMethodDecl(const ObjCMethodDecl *D) {
   SmallString<64> Buf;
   llvm::raw_svector_ostream StrOS(Buf);
   Mangler->mangleObjCMethodNameWithoutSize(D, StrOS);
-  std::string MangledName = StrOS.str();
+  std::string MangledName = StrOS.str().str();
 
   ObjectScope Scope(OF,
                     1 + IsInstanceMethod + IsPropertyAccessor +
@@ -2823,8 +2830,8 @@ void ASTExporter<ATDWriter>::VisitObjCPropertyDecl(const ObjCPropertyDecl *D) {
 
   ObjCPropertyDecl::PropertyControl PC = D->getPropertyImplementation();
   bool HasPropertyControl = PC != ObjCPropertyDecl::None;
-  ObjCPropertyDecl::PropertyAttributeKind Attrs = D->getPropertyAttributes();
-  bool HasPropertyAttributes = Attrs != ObjCPropertyDecl::OBJC_PR_noattr;
+  ObjCPropertyAttribute::Kind Attrs = D->getPropertyAttributes();
+  bool HasPropertyAttributes = Attrs != ObjCPropertyAttribute::kind_noattr;
 
   ObjCMethodDecl *Getter = D->getGetterMethodDecl();
   ObjCMethodDecl *Setter = D->getSetterMethodDecl();
@@ -2867,18 +2874,19 @@ void ASTExporter<ATDWriter>::VisitObjCPropertyDecl(const ObjCPropertyDecl *D) {
 
   if (HasPropertyAttributes) {
     OF.emitTag("property_attributes");
-    bool readonly = Attrs & ObjCPropertyDecl::OBJC_PR_readonly;
-    bool assign = Attrs & ObjCPropertyDecl::OBJC_PR_assign;
-    bool readwrite = Attrs & ObjCPropertyDecl::OBJC_PR_readwrite;
-    bool retain = Attrs & ObjCPropertyDecl::OBJC_PR_retain;
-    bool copy = Attrs & ObjCPropertyDecl::OBJC_PR_copy;
-    bool nonatomic = Attrs & ObjCPropertyDecl::OBJC_PR_nonatomic;
-    bool atomic = Attrs & ObjCPropertyDecl::OBJC_PR_atomic;
-    bool weak = Attrs & ObjCPropertyDecl::OBJC_PR_weak;
-    bool strong = Attrs & ObjCPropertyDecl::OBJC_PR_strong;
-    bool unsafeUnretained = Attrs & ObjCPropertyDecl::OBJC_PR_unsafe_unretained;
-    bool getter = Attrs & ObjCPropertyDecl::OBJC_PR_getter;
-    bool setter = Attrs & ObjCPropertyDecl::OBJC_PR_setter;
+    bool readonly = Attrs & ObjCPropertyAttribute::kind_readonly;
+    bool assign = Attrs & ObjCPropertyAttribute::kind_assign;
+    bool readwrite = Attrs & ObjCPropertyAttribute::kind_readwrite;
+    bool retain = Attrs & ObjCPropertyAttribute::kind_retain;
+    bool copy = Attrs & ObjCPropertyAttribute::kind_copy;
+    bool nonatomic = Attrs & ObjCPropertyAttribute::kind_nonatomic;
+    bool atomic = Attrs & ObjCPropertyAttribute::kind_atomic;
+    bool weak = Attrs & ObjCPropertyAttribute::kind_weak;
+    bool strong = Attrs & ObjCPropertyAttribute::kind_strong;
+    bool unsafeUnretained =
+        Attrs & ObjCPropertyAttribute::kind_unsafe_unretained;
+    bool getter = Attrs & ObjCPropertyAttribute::kind_getter;
+    bool setter = Attrs & ObjCPropertyAttribute::kind_setter;
     int toEmit = readonly + assign + readwrite + retain + copy + nonatomic +
                  atomic + weak + strong + unsafeUnretained + getter + setter;
     ArrayScope Scope(OF, toEmit);
@@ -2984,13 +2992,24 @@ void ASTExporter<ATDWriter>::VisitBlockDecl(const BlockDecl *D) {
   bool HasCapturedVariables = CII != CIE;
   const Stmt *Body = D->getBody();
 
-  SmallString<64> Buf;
-  llvm::raw_svector_ostream StrOS(Buf);
-  Mangler->mangleBlock(D->getDeclContext(), D, StrOS);
-  std::string MangledName = StrOS.str();
+  std::string MangledName;
+  const DeclContext *DC = D->getDeclContext();
+  if (auto ND = dyn_cast<NamedDecl>(DC)) {
+    if (!isa<FunctionDecl>(ND) && !isa<VarDecl>(ND) && ND->getIdentifier()) {
+      MangledName = ND->getIdentifier()->getName().str();
+    } else if (!isa<CXXConstructorDecl>(DC) && !isa<CXXDestructorDecl>(DC)) {
+      SmallString<64> Buf;
+      llvm::raw_svector_ostream StrOS(Buf);
+      Mangler->mangleBlock(DC, D, StrOS);
+      MangledName = StrOS.str().str();
+    }
+  }
 
   int size = 0 + HasParameters + IsVariadic + CapturesCXXThis +
-             HasCapturedVariables + (bool)Body + 1 /* MangledName*/;
+             HasCapturedVariables + (bool)Body;
+  if (!MangledName.empty())
+    ++size;
+
   ObjectScope Scope(OF, size); // not covered by tests
 
   if (HasParameters) {
@@ -3035,8 +3054,10 @@ void ASTExporter<ATDWriter>::VisitBlockDecl(const BlockDecl *D) {
     dumpStmt(Body);
   }
 
-  OF.emitTag("mangled_name");
-  OF.emitString(MangledName);
+  if (!MangledName.empty()) {
+    OF.emitTag("mangled_name");
+    OF.emitString(MangledName);
+  }
 }
 
 // main variant for declarations
@@ -3219,7 +3240,7 @@ void ASTExporter<ATDWriter>::VisitGotoStmt(const GotoStmt *Node) {
   VisitStmt(Node);
   ObjectScope Scope(OF, 2); // not covered by tests
   OF.emitTag("label");
-  OF.emitString(Node->getLabel()->getName());
+  OF.emitString(Node->getLabel()->getName().str());
   OF.emitTag("pointer");
   dumpPointer(Node->getLabel());
 }
@@ -3305,6 +3326,9 @@ void ASTExporter<ATDWriter>::VisitExpr(const Expr *Node) {
     case OK_VectorComponent:
       OF.emitSimpleVariant("VectorComponent");
       break;
+    case OK_MatrixComponent:
+      OF.emitSimpleVariant("MatrixComponent");
+      break;
     case OK_Ordinary:
       llvm_unreachable("unreachable");
       break;
@@ -3325,7 +3349,7 @@ void ASTExporter<ATDWriter>::dumpCXXBaseSpecifier(
   OF.emitTag("name");
   const CXXRecordDecl *RD =
       cast<CXXRecordDecl>(Base.getType()->getAs<RecordType>()->getDecl());
-  OF.emitString(RD->getName());
+  OF.emitString(RD->getName().str());
   OF.emitFlag("virtual", IsVirtual);
 }
 
@@ -3558,6 +3582,12 @@ void ASTExporter<ATDWriter>::VisitPredefinedExpr(const PredefinedExpr *Node) {
   case PredefinedExpr::PrettyFunctionNoVirtual:
     OF.emitSimpleVariant("PrettyFunctionNoVirtual");
     break;
+  case PredefinedExpr::UniqueStableNameType:
+    OF.emitSimpleVariant("UniqueStableNameType");
+    break;
+  case PredefinedExpr::UniqueStableNameExpr:
+    OF.emitSimpleVariant("UniqueStableNameExpr");
+    break;
   }
 }
 
@@ -3626,7 +3656,7 @@ void ASTExporter<ATDWriter>::VisitFloatingLiteral(const FloatingLiteral *Node) {
   VisitExpr(Node);
   llvm::SmallString<20> buf;
   Node->getValue().toString(buf);
-  OF.emitString(buf.str());
+  OF.emitString(buf.str().str());
 }
 
 template <class ATDWriter>
@@ -3645,8 +3675,9 @@ void ASTExporter<ATDWriter>::VisitStringLiteral(const StringLiteral *Str) {
   }
   ArrayScope Scope(OF, n_chunks);
   for (size_t i = 0; i < n_chunks; ++i) {
-    OF.emitString(Str->getBytes().substr(i * Options.maxStringSize,
-                                         Options.maxStringSize));
+    OF.emitString(Str->getBytes()
+                      .substr(i * Options.maxStringSize, Options.maxStringSize)
+                      .str());
   }
 }
 
@@ -3895,7 +3926,7 @@ void ASTExporter<ATDWriter>::VisitAddrLabelExpr(const AddrLabelExpr *Node) {
   VisitExpr(Node);
   ObjectScope Scope(OF, 2); // not covered by tests
   OF.emitTag("label");
-  OF.emitString(Node->getLabel()->getName());
+  OF.emitString(Node->getLabel()->getName().str());
   OF.emitTag("pointer");
   dumpPointer(Node->getLabel());
 }
@@ -4030,9 +4061,17 @@ void ASTExporter<ATDWriter>::VisitExprWithCleanups(
 
   if (HasDeclRefs) {
     OF.emitTag("decl_refs");
-    ArrayScope Scope(OF, Node->getNumObjects());
+    unsigned int ctr = 0;
     for (unsigned i = 0, e = Node->getNumObjects(); i != e; ++i)
-      dumpDeclRef(*Node->getObject(i));
+      if (Node->getObject(i).is<clang::BlockDecl *>())
+        ++ctr;
+    ArrayScope Scope(OF, ctr);
+    for (unsigned i = 0, e = Node->getNumObjects(); i != e; ++i) {
+      auto p = Node->getObject(i);
+      if (p.is<clang::BlockDecl *>()) {
+        dumpDeclRef(**p.getAddrOfPtr1());
+      }
+    }
   }
 }
 
@@ -4975,9 +5014,17 @@ int ASTExporter<ATDWriter>::BuiltinTypeTupleSize() {
 //@atd type builtin_type_kind = [
 #define BUILTIN_TYPE(TYPE, ID) //@atd   | TYPE
 #include <clang/AST/BuiltinTypes.def>
-#define SVE_PREDICATE_TYPE(Name, Id, SingletonId, ElKind) //@atd   | Id
-#define SVE_VECTOR_TYPE( \
-    Name, Id, SingletonId, ElKind, ElBits, IsSigned, IsFP) //@atd   | Id
+#define SVE_PREDICATE_TYPE( \
+    Name, MangledName, Id, SingletonId, NumEls) //@atd   | Id
+#define SVE_VECTOR_TYPE(Name,        \
+                        MangledName, \
+                        Id,          \
+                        SingletonId, \
+                        NumEls,      \
+                        ElBits,      \
+                        IsSigned,    \
+                        IsFP,        \
+                        IsBF) //@atd   | Id
 #include <clang/Basic/AArch64SVEACLETypes.def>
 //@atd ]
 template <class ATDWriter>
@@ -4991,12 +5038,13 @@ void ASTExporter<ATDWriter>::VisitBuiltinType(const BuiltinType *T) {
     break;                     \
   }
 #include <clang/AST/BuiltinTypes.def>
-#define SVE_PREDICATE_TYPE(Name, Id, SingletonId, ElKind) \
+#define SVE_PREDICATE_TYPE(Name, MangeldName, Id, SingletonId, NumEls) \
   case BuiltinType::Id: {                                 \
     type_name = #Id;                                      \
     break;                                                \
   }
-#define SVE_VECTOR_TYPE(Name, Id, SingletonId, ElKind, ElBits, IsSigned, IsFP) \
+#define SVE_VECTOR_TYPE(                                                      \
+    Name, MangledName, Id, SingletonId, NumEls, ElBits, IsSigned, IsFP, IsBF) \
   case BuiltinType::Id: {                                                      \
     type_name = #Id;                                                           \
     break;                                                                     \
diff --git a/facebook-clang-plugins/libtooling/FileUtils.cpp b/facebook-clang-plugins/libtooling/FileUtils.cpp
index 14581f19c..afed9b3a3 100644
--- a/facebook-clang-plugins/libtooling/FileUtils.cpp
+++ b/facebook-clang-plugins/libtooling/FileUtils.cpp
@@ -37,10 +37,10 @@ std::string makeAbsolutePath(const std::string &currentWorkingDirectory,
     result.append(1, path.front());
   }
 
-  elements.push_back(llvm::sys::path::filename(path));
+  elements.push_back(llvm::sys::path::filename(path).str());
 
   while (llvm::sys::path::has_parent_path(path)) {
-    path = llvm::sys::path::parent_path(path);
+    path = llvm::sys::path::parent_path(path).str();
     const std::string &element(llvm::sys::path::filename(path));
     if (element == ".") {
       continue;
@@ -76,7 +76,7 @@ std::string makeRelativePath(const std::string &repoRoot,
       return path.substr(repoRoot.size() + 1);
     }
     if (allowSiblingsToRepoRoot) {
-      std::string parentOfRoot = llvm::sys::path::parent_path(repoRoot);
+      std::string parentOfRoot = llvm::sys::path::parent_path(repoRoot).str();
       if (llvm::StringRef(path).startswith(parentOfRoot + "/")) {
         return "../" + path.substr(parentOfRoot.size() + 1);
       }
diff --git a/facebook-clang-plugins/libtooling/NamePrinter.h b/facebook-clang-plugins/libtooling/NamePrinter.h
index d0d291c9f..10991ee3f 100644
--- a/facebook-clang-plugins/libtooling/NamePrinter.h
+++ b/facebook-clang-plugins/libtooling/NamePrinter.h
@@ -53,7 +53,7 @@ uint64_t fnv64Hash(const char *s, int n) {
 }
 
 uint64_t fnv64Hash(llvm::raw_svector_ostream &OS) {
-  std::string s = OS.str();
+  std::string s = OS.str().str();
   return fnv64Hash(s.data(), s.size());
 }
 
@@ -155,7 +155,7 @@ void NamePrinter<ATDWriter>::VisitTagDecl(const TagDecl *D) {
     Args = TemplateArgs.asArray();
     printTemplateArgList(StrOS, Args);
   }
-  OF.emitString(StrOS.str());
+  OF.emitString(StrOS.str().str());
 }
 
 template <class ATDWriter>
@@ -167,7 +167,7 @@ void NamePrinter<ATDWriter>::VisitFunctionDecl(const FunctionDecl *FD) {
     SmallString<64> Buf;
     llvm::raw_svector_ostream StrOS(Buf);
     printTemplateArgList(StrOS, TemplateArgs->asArray());
-    template_str = StrOS.str();
+    template_str = StrOS.str().str();
   }
   OF.emitString(FD->getNameAsString() + template_str);
 }
diff --git a/facebook-clang-plugins/libtooling/SimplePluginASTAction.cpp b/facebook-clang-plugins/libtooling/SimplePluginASTAction.cpp
index 6770f50d4..ebdd64501 100644
--- a/facebook-clang-plugins/libtooling/SimplePluginASTAction.cpp
+++ b/facebook-clang-plugins/libtooling/SimplePluginASTAction.cpp
@@ -121,7 +121,7 @@ void PluginASTOptionsBase::loadValuesFromEnvAndMap(const argmap_t map) {
     if (llvm::sys::fs::current_path(CurrentDir)) {
       llvm::errs() << "Failed to retrieve current working directory\n";
     } else {
-      basePath = CurrentDir.str();
+      basePath = CurrentDir.str().str();
     }
   }
 }
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/Hello.m.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/Hello.m.exp
index 88dd3eb21..1dac8d7a7 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/Hello.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/Hello.m.exp
@@ -780,20 +780,21 @@
             #eb8a1f5a: true,
             #0a16e1f2: true,
             #1771a8d7: [
+              <#16427154: ({ #d121c0bd: 89, #21793419: ({ }, { }) })>,
               <#f68c4428:
                  ({
-                    #d121c0bd: 89,
+                    #d121c0bd: 90,
                     #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 13 })
                   })>
             ]
           },
           { #c8ff724b: "NSLog", #2cdb06fb: [ "NSLog" ] },
-          { #c1127ea9: 90 },
+          { #c1127ea9: 91 },
           {
             #ed526254: true,
             #d17ebeaa: [
               <#fd75cc45:
-                 ({ #d121c0bd: 91, #21793419: ({ }, { }) },
+                 ({ #d121c0bd: 92, #21793419: ({ }, { }) },
                   { #c8ff724b: "", #2cdb06fb: [ "" ] },
                   { #c1127ea9: 7 },
                   { #0370b1b2: 0 })>
@@ -801,26 +802,27 @@
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 92,
+            #d121c0bd: 93,
             #21793419: ({ #c68b4ed6: 1 }, { #c68b4ed6: 34 }),
             #0a16e1f2: true,
             #d3368c8a: true,
             #1771a8d7: [
+              <#16427154: ({ #d121c0bd: 94, #21793419: ({ }, { }) })>,
               <#f68c4428:
                  ({
-                    #d121c0bd: 93,
+                    #d121c0bd: 95,
                     #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 13 })
                   })>
             ]
           },
           { #c8ff724b: "NSLog", #2cdb06fb: [ "NSLog" ] },
-          { #c1127ea9: 90 },
+          { #c1127ea9: 91 },
           {
             #ed526254: true,
             #d17ebeaa: [
               <#fd75cc45:
                  ({
-                    #d121c0bd: 94,
+                    #d121c0bd: 96,
                     #21793419: ({ #c68b4ed6: 19 }, { #c68b4ed6: 28 })
                   },
                   { #c8ff724b: "", #2cdb06fb: [ "" ] },
@@ -830,7 +832,7 @@
           })>,
       <#18d25297:
          ({
-            #d121c0bd: 95,
+            #d121c0bd: 97,
             #f9005968: 1,
             #21793419:
               ({ #c3bbce7c: "tests/Hello.m", #c7b317f4: 10, #c68b4ed6: 1 },
@@ -840,19 +842,19 @@
           [
             <#3ccd3797:
                ({
-                  #d121c0bd: 96,
-                  #f9005968: 95,
+                  #d121c0bd: 98,
+                  #f9005968: 97,
                   #21793419:
                     ({ #c7b317f4: 11, #c68b4ed6: 1 }, { #c68b4ed6: 19 })
                 },
                 { #c8ff724b: "say:", #2cdb06fb: [ "say:", "Hello" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 97 },
+                  #137b649c: { #c1127ea9: 99 },
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 98,
+                          #d121c0bd: 100,
                           #21793419: ({ #c68b4ed6: 14 }, { #c68b4ed6: 18 })
                         },
                         { #c8ff724b: "i", #2cdb06fb: [ "i" ] },
@@ -862,16 +864,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 99,
+                          #d121c0bd: 101,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 100, #ea1a680e: true },
+                        { #c1127ea9: 102, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 101,
+                          #d121c0bd: 103,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -891,13 +893,13 @@
             },
             #d32dd232: {
               #c709e154: <#c37c57de>,
-              #ec05e4a8: 102,
+              #ec05e4a8: 104,
               #c8ff724b: { #c8ff724b: "Hello", #2cdb06fb: [ "Hello" ] }
             }
           })>,
       <#0e281b68:
          ({
-            #d121c0bd: 102,
+            #d121c0bd: 104,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 14, #c68b4ed6: 1 },
@@ -907,8 +909,8 @@
           [
             <#3ccd3797:
                ({
-                  #d121c0bd: 103,
-                  #f9005968: 102,
+                  #d121c0bd: 105,
+                  #f9005968: 104,
                   #21793419:
                     ({ #c7b317f4: 15, #c68b4ed6: 1 },
                      { #c7b317f4: 19, #c68b4ed6: 1 })
@@ -916,11 +918,11 @@
                 { #c8ff724b: "say:", #2cdb06fb: [ "say:", "Hello" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 97 },
+                  #137b649c: { #c1127ea9: 99 },
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 104,
+                          #d121c0bd: 106,
                           #21793419:
                             ({ #c7b317f4: 15, #c68b4ed6: 14 },
                              { #c68b4ed6: 18 }),
@@ -934,16 +936,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 105,
+                          #d121c0bd: 107,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 100, #ea1a680e: true },
+                        { #c1127ea9: 102, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 106,
+                          #d121c0bd: 108,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -954,7 +956,7 @@
                   #c11b7aa2:
                     <#d394bb73:
                        ({
-                          #d121c0bd: 107,
+                          #d121c0bd: 109,
                           #21793419:
                             ({ #c68b4ed6: 20 },
                              { #c7b317f4: 19, #c68b4ed6: 1 })
@@ -962,7 +964,7 @@
                         [
                           <#22219ce5:
                              ({
-                                #d121c0bd: 108,
+                                #d121c0bd: 110,
                                 #21793419:
                                   ({ #c7b317f4: 16, #c68b4ed6: 3 },
                                    { #c7b317f4: 18, #c68b4ed6: 3 })
@@ -970,7 +972,7 @@
                               [
                                 <#d49390e5:
                                    ({
-                                      #d121c0bd: 109,
+                                      #d121c0bd: 111,
                                       #21793419:
                                         ({ #c7b317f4: 16, #c68b4ed6: 7 },
                                          { #c68b4ed6: 11 })
@@ -978,7 +980,7 @@
                                     [
                                       <#c3b129f9:
                                          ({
-                                            #d121c0bd: 110,
+                                            #d121c0bd: 112,
                                             #21793419:
                                               ({ #c68b4ed6: 7 },
                                                { #c68b4ed6: 7 })
@@ -986,7 +988,7 @@
                                           [
                                             <#e9db58be:
                                                ({
-                                                  #d121c0bd: 111,
+                                                  #d121c0bd: 113,
                                                   #21793419:
                                                     ({ #c68b4ed6: 7 },
                                                      { #c68b4ed6: 7 })
@@ -1001,7 +1003,7 @@
                                                 {
                                                   #c369ebbe: {
                                                     #c709e154: <#334f163b>,
-                                                    #ec05e4a8: 104,
+                                                    #ec05e4a8: 106,
                                                     #c8ff724b: {
                                                       #c8ff724b: "i",
                                                       #2cdb06fb: [ "i" ]
@@ -1019,7 +1021,7 @@
                                           })>,
                                       <#0fb8fb71:
                                          ({
-                                            #d121c0bd: 112,
+                                            #d121c0bd: 114,
                                             #21793419:
                                               ({ #c68b4ed6: 11 },
                                                { #c68b4ed6: 11 })
@@ -1036,7 +1038,7 @@
                                     { #c709e154: <#00003e2d> })>,
                                 <#d394bb73:
                                    ({
-                                      #d121c0bd: 113,
+                                      #d121c0bd: 115,
                                       #21793419:
                                         ({ #c68b4ed6: 14 },
                                          { #c7b317f4: 18, #c68b4ed6: 3 })
@@ -1044,7 +1046,7 @@
                                     [
                                       <#c59ea513:
                                          ({
-                                            #d121c0bd: 114,
+                                            #d121c0bd: 116,
                                             #21793419:
                                               ({
                                                  #c7b317f4: 17,
@@ -1055,7 +1057,7 @@
                                           [
                                             <#c3b129f9:
                                                ({
-                                                  #d121c0bd: 115,
+                                                  #d121c0bd: 117,
                                                   #21793419:
                                                     ({ #c68b4ed6: 5 },
                                                      { #c68b4ed6: 5 })
@@ -1063,7 +1065,7 @@
                                                 [
                                                   <#e9db58be:
                                                      ({
-                                                        #d121c0bd: 116,
+                                                        #d121c0bd: 118,
                                                         #21793419:
                                                           ({ #c68b4ed6: 5 },
                                                            { #c68b4ed6: 5 })
@@ -1071,14 +1073,14 @@
                                                       [],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 90
+                                                          #c1127ea9: 91
                                                         }
                                                       },
                                                       {
                                                         #c369ebbe: {
                                                           #c709e154:
                                                             <#ee046738>,
-                                                          #ec05e4a8: 92,
+                                                          #ec05e4a8: 93,
                                                           #c8ff724b: {
                                                             #c8ff724b:
                                                               "NSLog",
@@ -1087,14 +1089,14 @@
                                                             ]
                                                           },
                                                           #30e4876a: {
-                                                            #c1127ea9: 90
+                                                            #c1127ea9: 91
                                                           }
                                                         }
                                                       })>
                                                 ],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 117
+                                                    #c1127ea9: 119
                                                   }
                                                 },
                                                 {
@@ -1103,7 +1105,7 @@
                                                 })>,
                                             <#c3b129f9:
                                                ({
-                                                  #d121c0bd: 118,
+                                                  #d121c0bd: 120,
                                                   #21793419:
                                                     ({ #c68b4ed6: 11 },
                                                      { #c68b4ed6: 12 })
@@ -1111,7 +1113,7 @@
                                                 [
                                                   <#ff6ba872:
                                                      ({
-                                                        #d121c0bd: 119,
+                                                        #d121c0bd: 121,
                                                         #21793419:
                                                           ({ #c68b4ed6: 11 },
                                                            { #c68b4ed6: 12 })
@@ -1119,7 +1121,7 @@
                                                       [
                                                         <#3231247e:
                                                            ({
-                                                              #d121c0bd: 120,
+                                                              #d121c0bd: 122,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -1134,7 +1136,7 @@
                                                             {
                                                               #30e4876a: {
                                                                 #c1127ea9:
-                                                                  121
+                                                                  123
                                                               },
                                                               #0e89e422:
                                                                 <#28055b85>
@@ -1158,7 +1160,7 @@
                                                 })>,
                                             <#c3b129f9:
                                                ({
-                                                  #d121c0bd: 122,
+                                                  #d121c0bd: 124,
                                                   #21793419:
                                                     ({ #c68b4ed6: 34 },
                                                      { #c68b4ed6: 34 })
@@ -1166,7 +1168,7 @@
                                                 [
                                                   <#e9db58be:
                                                      ({
-                                                        #d121c0bd: 123,
+                                                        #d121c0bd: 125,
                                                         #21793419:
                                                           ({ #c68b4ed6: 34 },
                                                            { #c68b4ed6: 34 })
@@ -1183,7 +1185,7 @@
                                                         #c369ebbe: {
                                                           #c709e154:
                                                             <#334f163b>,
-                                                          #ec05e4a8: 104,
+                                                          #ec05e4a8: 106,
                                                           #c8ff724b: {
                                                             #c8ff724b: "i",
                                                             #2cdb06fb: [
@@ -1206,10 +1208,10 @@
                                                   #fa1a3bd3: []
                                                 })>
                                           ],
-                                          { #30e4876a: { #c1127ea9: 97 } })>
+                                          { #30e4876a: { #c1127ea9: 99 } })>
                                     ])>
                               ],
-                              { #c1c4b9e2: 109, #ccfc02dd: 113 })>
+                              { #c1c4b9e2: 111, #ccfc02dd: 115 })>
                         ])>,
                   #d2e9b40c: "-[Hello say:]"
                 })>
@@ -1218,24 +1220,24 @@
           {
             #2ec29bb2: {
               #c709e154: <#3cf18b8d>,
-              #ec05e4a8: 95,
+              #ec05e4a8: 97,
               #c8ff724b: { #c8ff724b: "Hello", #2cdb06fb: [ "Hello" ] }
             }
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 124,
+            #d121c0bd: 126,
             #21793419:
               ({ #c7b317f4: 22, #c68b4ed6: 1 },
                { #c7b317f4: 29, #c68b4ed6: 1 })
           },
           { #c8ff724b: "main", #2cdb06fb: [ "main" ] },
-          { #c1127ea9: 125 },
+          { #c1127ea9: 127 },
           {
             #d17ebeaa: [
               <#fd75cc45:
                  ({
-                    #d121c0bd: 126,
+                    #d121c0bd: 128,
                     #21793419:
                       ({ #c7b317f4: 22, #c68b4ed6: 10 }, { #c68b4ed6: 14 })
                   },
@@ -1244,25 +1246,25 @@
                   { #0370b1b2: 0 })>,
               <#fd75cc45:
                  ({
-                    #d121c0bd: 127,
+                    #d121c0bd: 129,
                     #21793419: ({ #c68b4ed6: 20 }, { #c68b4ed6: 31 })
                   },
                   { #c8ff724b: "argv", #2cdb06fb: [ "argv" ] },
-                  { #c1127ea9: 128 },
+                  { #c1127ea9: 130 },
                   { #0370b1b2: 1 })>
             ],
-            #ebe3c415: 124,
+            #ebe3c415: 126,
             #c11b7aa2:
               <#d394bb73:
                  ({
-                    #d121c0bd: 129,
+                    #d121c0bd: 131,
                     #21793419:
                       ({ #c68b4ed6: 34 }, { #c7b317f4: 29, #c68b4ed6: 1 })
                   },
                   [
                     <#1b5ec1d1:
                        ({
-                          #d121c0bd: 130,
+                          #d121c0bd: 132,
                           #21793419:
                             ({ #c7b317f4: 23, #c68b4ed6: 3 },
                              { #c7b317f4: 27, #c68b4ed6: 3 })
@@ -1270,7 +1272,7 @@
                         [
                           <#152ea3f2:
                              ({
-                                #d121c0bd: 131,
+                                #d121c0bd: 133,
                                 #21793419:
                                   ({ #c7b317f4: 23, #c68b4ed6: 8 },
                                    { #c68b4ed6: 17 })
@@ -1278,7 +1280,7 @@
                               [
                                 <#0fb8fb71:
                                    ({
-                                      #d121c0bd: 132,
+                                      #d121c0bd: 134,
                                       #21793419:
                                         ({ #c68b4ed6: 16 }, { #c68b4ed6: 16 })
                                     },
@@ -1293,7 +1295,7 @@
                               [
                                 <#11c182d1:
                                    ({
-                                      #d121c0bd: 133,
+                                      #d121c0bd: 135,
                                       #21793419:
                                         ({ #c68b4ed6: 8 }, { #c68b4ed6: 16 }),
                                       #0a16e1f2: true,
@@ -1305,7 +1307,7 @@
                                       #fe93c404:
                                         <#0fb8fb71:
                                            ({
-                                              #d121c0bd: 132,
+                                              #d121c0bd: 134,
                                               #21793419:
                                                 ({ #c68b4ed6: 16 },
                                                  { #c68b4ed6: 16 })
@@ -1320,24 +1322,24 @@
                                     })>
                               ])>,
                           <#03b4c48f:
-                             ({ #d121c0bd: 134, #21793419: ({ }, { }) }, [])>,
+                             ({ #d121c0bd: 136, #21793419: ({ }, { }) }, [])>,
                           <#d49390e5:
                              ({
-                                #d121c0bd: 135,
+                                #d121c0bd: 137,
                                 #21793419:
                                   ({ #c68b4ed6: 19 }, { #c68b4ed6: 23 })
                               },
                               [
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 136,
+                                      #d121c0bd: 138,
                                       #21793419:
                                         ({ #c68b4ed6: 19 }, { #c68b4ed6: 19 })
                                     },
                                     [
                                       <#e9db58be:
                                          ({
-                                            #d121c0bd: 137,
+                                            #d121c0bd: 139,
                                             #21793419:
                                               ({ #c68b4ed6: 19 },
                                                { #c68b4ed6: 19 })
@@ -1350,7 +1352,7 @@
                                           {
                                             #c369ebbe: {
                                               #c709e154: <#004196c7>,
-                                              #ec05e4a8: 133,
+                                              #ec05e4a8: 135,
                                               #c8ff724b: {
                                                 #c8ff724b: "i",
                                                 #2cdb06fb: [ "i" ]
@@ -1363,7 +1365,7 @@
                                     { #c91e0a14: <#f7495e1f>, #fa1a3bd3: [] })>,
                                 <#0fb8fb71:
                                    ({
-                                      #d121c0bd: 138,
+                                      #d121c0bd: 140,
                                       #21793419:
                                         ({ #c68b4ed6: 23 }, { #c68b4ed6: 23 })
                                     },
@@ -1379,14 +1381,14 @@
                               { #c709e154: <#00004288> })>,
                           <#30da4453:
                              ({
-                                #d121c0bd: 139,
+                                #d121c0bd: 141,
                                 #21793419:
                                   ({ #c68b4ed6: 26 }, { #c68b4ed6: 27 })
                               },
                               [
                                 <#e9db58be:
                                    ({
-                                      #d121c0bd: 140,
+                                      #d121c0bd: 142,
                                       #21793419:
                                         ({ #c68b4ed6: 26 }, { #c68b4ed6: 26 })
                                     },
@@ -1398,7 +1400,7 @@
                                     {
                                       #c369ebbe: {
                                         #c709e154: <#004196c7>,
-                                        #ec05e4a8: 133,
+                                        #ec05e4a8: 135,
                                         #c8ff724b: {
                                           #c8ff724b: "i",
                                           #2cdb06fb: [ "i" ]
@@ -1411,7 +1413,7 @@
                               { #c709e154: <#e44b643e>, #f1c5e8e0: true })>,
                           <#d394bb73:
                              ({
-                                #d121c0bd: 141,
+                                #d121c0bd: 143,
                                 #21793419:
                                   ({ #c68b4ed6: 31 },
                                    { #c7b317f4: 27, #c68b4ed6: 3 })
@@ -1419,7 +1421,7 @@
                               [
                                 <#1a1d5a70:
                                    ({
-                                      #d121c0bd: 142,
+                                      #d121c0bd: 144,
                                       #21793419:
                                         ({ #c7b317f4: 24, #c68b4ed6: 5 },
                                          { #c7b317f4: 26, #c68b4ed6: 5 })
@@ -1427,7 +1429,7 @@
                                     [
                                       <#d394bb73:
                                          ({
-                                            #d121c0bd: 143,
+                                            #d121c0bd: 145,
                                             #21793419:
                                               ({
                                                  #c7b317f4: 24,
@@ -1441,7 +1443,7 @@
                                           [
                                             <#d0cddcea:
                                                ({
-                                                  #d121c0bd: 144,
+                                                  #d121c0bd: 146,
                                                   #21793419:
                                                     ({
                                                        #c7b317f4: 25,
@@ -1452,7 +1454,7 @@
                                                 [
                                                   <#f104c570:
                                                      ({
-                                                        #d121c0bd: 145,
+                                                        #d121c0bd: 147,
                                                         #21793419:
                                                           ({ #c68b4ed6: 7 },
                                                            { #c68b4ed6: 25 })
@@ -1460,7 +1462,7 @@
                                                       [
                                                         <#c3b129f9:
                                                            ({
-                                                              #d121c0bd: 146,
+                                                              #d121c0bd: 148,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -1475,7 +1477,7 @@
                                                               <#f104c570:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    147,
+                                                                    149,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -1491,7 +1493,7 @@
                                                                   {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    100
+                                                                    102
                                                                     }
                                                                   },
                                                                   {
@@ -1503,14 +1505,14 @@
                                                                     <
                                                                     #db85e818: {
                                                                     #c1127ea9:
-                                                                    148
+                                                                    150
                                                                     }>
                                                                   })>
                                                             ],
                                                             {
                                                               #30e4876a: {
                                                                 #c1127ea9:
-                                                                  100
+                                                                  102
                                                               }
                                                             },
                                                             {
@@ -1520,7 +1522,7 @@
                                                             })>,
                                                         <#c3b129f9:
                                                            ({
-                                                              #d121c0bd: 149,
+                                                              #d121c0bd: 151,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -1535,7 +1537,7 @@
                                                               <#e9db58be:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    150,
+                                                                    152,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -1561,7 +1563,7 @@
                                                                     #c709e154:
                                                                     <#004196c7>,
                                                                     #ec05e4a8:
-                                                                    133,
+                                                                    135,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "i",
@@ -1589,18 +1591,18 @@
                                                       ],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 97
+                                                          #c1127ea9: 99
                                                         }
                                                       },
                                                       {
                                                         #316d331f: "say:",
                                                         #1ea99a8b: true,
-                                                        #ec05e4a8: 103
+                                                        #ec05e4a8: 105
                                                       })>
                                                 ],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 97
+                                                    #c1127ea9: 99
                                                   }
                                                 },
                                                 { })>
@@ -1610,7 +1612,7 @@
                         ])>,
                     <#df3bdb38:
                        ({
-                          #d121c0bd: 151,
+                          #d121c0bd: 153,
                           #21793419:
                             ({ #c7b317f4: 28, #c68b4ed6: 3 },
                              { #c68b4ed6: 10 })
@@ -1618,7 +1620,7 @@
                         [
                           <#0fb8fb71:
                              ({
-                                #d121c0bd: 152,
+                                #d121c0bd: 154,
                                 #21793419:
                                   ({ #c68b4ed6: 10 }, { #c68b4ed6: 10 })
                               },
@@ -1633,7 +1635,7 @@
                   ])>
           })>,
       <#0f3f4d35:
-         ({ #d121c0bd: 153, #21793419: ({ }, { }), #eb8a1f5a: true },
+         ({ #d121c0bd: 155, #21793419: ({ }, { }), #eb8a1f5a: true },
           { #c8ff724b: "instancetype", #2cdb06fb: [ "instancetype" ] },
           21,
           { })>
@@ -1651,164 +1653,165 @@
       },
       #247f0baa: true,
       #1acb7079: [
-        <#22d546dd: ({ #d121c0bd: 97 }, <#392cef74>)>,
-        <#22d546dd: ({ #d121c0bd: 154 }, <#2bf4b04a>)>,
-        <#22d546dd: ({ #d121c0bd: 155 }, <#ec0a078a>)>,
-        <#22d546dd: ({ #d121c0bd: 156 }, <#f6dab0c9>)>,
-        <#22d546dd: ({ #d121c0bd: 157 }, <#0f54f45c>)>,
+        <#22d546dd: ({ #d121c0bd: 99 }, <#392cef74>)>,
+        <#22d546dd: ({ #d121c0bd: 156 }, <#2bf4b04a>)>,
+        <#22d546dd: ({ #d121c0bd: 157 }, <#ec0a078a>)>,
+        <#22d546dd: ({ #d121c0bd: 158 }, <#f6dab0c9>)>,
+        <#22d546dd: ({ #d121c0bd: 159 }, <#0f54f45c>)>,
         <#22d546dd: ({ #d121c0bd: 53 }, <#0037c4cf>)>,
-        <#22d546dd: ({ #d121c0bd: 158 }, <#3290d19c>)>,
-        <#22d546dd: ({ #d121c0bd: 159 }, <#fee0a138>)>,
-        <#22d546dd: ({ #d121c0bd: 160 }, <#1da7d9cb>)>,
-        <#22d546dd: ({ #d121c0bd: 161 }, <#0baa9fe7>)>,
+        <#22d546dd: ({ #d121c0bd: 160 }, <#3290d19c>)>,
+        <#22d546dd: ({ #d121c0bd: 161 }, <#fee0a138>)>,
+        <#22d546dd: ({ #d121c0bd: 162 }, <#1da7d9cb>)>,
+        <#22d546dd: ({ #d121c0bd: 163 }, <#0baa9fe7>)>,
         <#22d546dd: ({ #d121c0bd: 79 }, <#3866e79a>)>,
-        <#22d546dd: ({ #d121c0bd: 162 }, <#23a02071>)>,
-        <#22d546dd: ({ #d121c0bd: 163 }, <#09087e8d>)>,
-        <#22d546dd: ({ #d121c0bd: 164 }, <#15c4357c>)>,
-        <#22d546dd: ({ #d121c0bd: 165 }, <#e75f9f31>)>,
-        <#22d546dd: ({ #d121c0bd: 166 }, <#c2f78dcd>)>,
-        <#22d546dd: ({ #d121c0bd: 167 }, <#3726ba3b>)>,
-        <#22d546dd: ({ #d121c0bd: 168 }, <#3759b761>)>,
-        <#22d546dd: ({ #d121c0bd: 169 }, <#ebd317dd>)>,
-        <#22d546dd: ({ #d121c0bd: 170 }, <#2ec759b9>)>,
-        <#22d546dd: ({ #d121c0bd: 171 }, <#284d329d>)>,
-        <#22d546dd: ({ #d121c0bd: 172 }, <#35acb472>)>,
-        <#22d546dd: ({ #d121c0bd: 173 }, <#2b1d0544>)>,
-        <#22d546dd: ({ #d121c0bd: 174 }, <#0106ffa8>)>,
-        <#22d546dd: ({ #d121c0bd: 175 }, <#d6bc9d8a>)>,
-        <#22d546dd: ({ #d121c0bd: 176 }, <#19b0df66>)>,
-        <#22d546dd: ({ #d121c0bd: 177 }, <#1336b84a>)>,
-        <#22d546dd: ({ #d121c0bd: 178 }, <#20963a1f>)>,
-        <#22d546dd: ({ #d121c0bd: 179 }, <#16068af1>)>,
-        <#22d546dd: ({ #d121c0bd: 180 }, <#ebf08555>)>,
-        <#22d546dd: ({ #d121c0bd: 181 }, <#d78ceb63>)>,
-        <#22d546dd: ({ #d121c0bd: 182 }, <#dd2a33f3>)>,
-        <#22d546dd: ({ #d121c0bd: 183 }, <#ef62b1d7>)>,
-        <#22d546dd: ({ #d121c0bd: 184 }, <#0c8bf62c>)>,
-        <#22d546dd: ({ #d121c0bd: 185 }, <#13391dca>)>,
-        <#22d546dd: ({ #d121c0bd: 186 }, <#ecc0d32e>)>,
-        <#22d546dd: ({ #d121c0bd: 187 }, <#c2767110>)>,
-        <#22d546dd: ({ #d121c0bd: 188 }, <#c813b9a0>)>,
-        <#22d546dd: ({ #d121c0bd: 189 }, <#da4c3784>)>,
-        <#22d546dd: ({ #d121c0bd: 190 }, <#f7757bd9>)>,
-        <#22d546dd: ({ #d121c0bd: 191 }, <#fe22a377>)>,
-        <#22d546dd: ({ #d121c0bd: 192 }, <#d7aa58db>)>,
-        <#22d546dd: ({ #d121c0bd: 193 }, <#d2f340c8>)>,
-        <#22d546dd: ({ #d121c0bd: 194 }, <#2193aedd>)>,
-        <#22d546dd: ({ #d121c0bd: 195 }, <#0dd56321>)>,
-        <#22d546dd: ({ #d121c0bd: 196 }, <#d8e10c82>)>,
-        <#22d546dd: ({ #d121c0bd: 197 }, <#c4f079df>)>,
-        <#22d546dd: ({ #d121c0bd: 198 }, <#1ee7219a>)>,
-        <#22d546dd: ({ #d121c0bd: 199 }, <#0d506118>)>,
-        <#22d546dd: ({ #d121c0bd: 200 }, <#dec9bcfd>)>,
-        <#22d546dd: ({ #d121c0bd: 201 }, <#f1f6e5a2>)>,
-        <#22d546dd: ({ #d121c0bd: 202 }, <#d935d0cf>)>,
-        <#22d546dd: ({ #d121c0bd: 203 }, <#d35a4eab>)>,
-        <#2e6cf4ea: ({ #d121c0bd: 204 })>,
-        <#2e6cf4ea: ({ #d121c0bd: 205 })>,
+        <#22d546dd: ({ #d121c0bd: 164 }, <#23a02071>)>,
+        <#22d546dd: ({ #d121c0bd: 165 }, <#09087e8d>)>,
+        <#22d546dd: ({ #d121c0bd: 166 }, <#15c4357c>)>,
+        <#22d546dd: ({ #d121c0bd: 167 }, <#e75f9f31>)>,
+        <#22d546dd: ({ #d121c0bd: 168 }, <#c2f78dcd>)>,
+        <#22d546dd: ({ #d121c0bd: 169 }, <#3726ba3b>)>,
+        <#22d546dd: ({ #d121c0bd: 170 }, <#3759b761>)>,
+        <#22d546dd: ({ #d121c0bd: 171 }, <#ebd317dd>)>,
+        <#22d546dd: ({ #d121c0bd: 172 }, <#2ec759b9>)>,
+        <#22d546dd: ({ #d121c0bd: 173 }, <#284d329d>)>,
+        <#22d546dd: ({ #d121c0bd: 174 }, <#35acb472>)>,
+        <#22d546dd: ({ #d121c0bd: 175 }, <#2b1d0544>)>,
+        <#22d546dd: ({ #d121c0bd: 176 }, <#0106ffa8>)>,
+        <#22d546dd: ({ #d121c0bd: 177 }, <#d6bc9d8a>)>,
+        <#22d546dd: ({ #d121c0bd: 178 }, <#19b0df66>)>,
+        <#22d546dd: ({ #d121c0bd: 179 }, <#1336b84a>)>,
+        <#22d546dd: ({ #d121c0bd: 180 }, <#20963a1f>)>,
+        <#22d546dd: ({ #d121c0bd: 181 }, <#16068af1>)>,
+        <#22d546dd: ({ #d121c0bd: 182 }, <#ebf08555>)>,
+        <#22d546dd: ({ #d121c0bd: 183 }, <#d78ceb63>)>,
+        <#22d546dd: ({ #d121c0bd: 184 }, <#dd2a33f3>)>,
+        <#22d546dd: ({ #d121c0bd: 185 }, <#ef62b1d7>)>,
+        <#22d546dd: ({ #d121c0bd: 186 }, <#0c8bf62c>)>,
+        <#22d546dd: ({ #d121c0bd: 187 }, <#13391dca>)>,
+        <#22d546dd: ({ #d121c0bd: 188 }, <#ecc0d32e>)>,
+        <#22d546dd: ({ #d121c0bd: 189 }, <#c2767110>)>,
+        <#22d546dd: ({ #d121c0bd: 190 }, <#c813b9a0>)>,
+        <#22d546dd: ({ #d121c0bd: 191 }, <#da4c3784>)>,
+        <#22d546dd: ({ #d121c0bd: 192 }, <#f7757bd9>)>,
+        <#22d546dd: ({ #d121c0bd: 193 }, <#fe22a377>)>,
+        <#22d546dd: ({ #d121c0bd: 194 }, <#d7aa58db>)>,
+        <#22d546dd: ({ #d121c0bd: 195 }, <#d2f340c8>)>,
+        <#22d546dd: ({ #d121c0bd: 196 }, <#2193aedd>)>,
+        <#22d546dd: ({ #d121c0bd: 197 }, <#0dd56321>)>,
+        <#22d546dd: ({ #d121c0bd: 198 }, <#d8e10c82>)>,
+        <#22d546dd: ({ #d121c0bd: 199 }, <#c4f079df>)>,
+        <#22d546dd: ({ #d121c0bd: 200 }, <#1ee7219a>)>,
+        <#22d546dd: ({ #d121c0bd: 201 }, <#0d506118>)>,
+        <#22d546dd: ({ #d121c0bd: 202 }, <#dec9bcfd>)>,
+        <#22d546dd: ({ #d121c0bd: 203 }, <#f1f6e5a2>)>,
+        <#22d546dd: ({ #d121c0bd: 204 }, <#d935d0cf>)>,
+        <#22d546dd: ({ #d121c0bd: 205 }, <#d35a4eab>)>,
         <#2e6cf4ea: ({ #d121c0bd: 206 })>,
         <#2e6cf4ea: ({ #d121c0bd: 207 })>,
-        <#22d546dd: ({ #d121c0bd: 208 }, <#c9ba0f87>)>,
-        <#22d546dd: ({ #d121c0bd: 209 }, <#db21580c>)>,
-        <#22d546dd: ({ #d121c0bd: 210 }, <#391b1e6e>)>,
-        <#d3d219f7: ({ #d121c0bd: 211 }, { #c1127ea9: 97 })>,
-        <#22d546dd: ({ #d121c0bd: 212 }, <#ea323187>)>,
-        <#22d546dd: ({ #d121c0bd: 213 }, <#2fe155d3>)>,
-        <#d3d219f7: ({ #d121c0bd: 214 }, { #c1127ea9: 210 })>,
-        <#0098a8c5: ({ #d121c0bd: 215 }, { #fcd148e8: 208 })>,
-        <#2e3d736c: ({ #d121c0bd: 216 }, { #c1127ea9: 215 })>,
-        <#0098a8c5: ({ #d121c0bd: 217 }, { #fcd148e8: 209 })>,
-        <#2e3d736c: ({ #d121c0bd: 218 }, { #c1127ea9: 217 })>,
-        <#2374f4e7: ({ #d121c0bd: 219 }, 10)>,
-        <#d80cb60b: ({ #d121c0bd: 220 }, 221)>,
-        <#d3d219f7: ({ #d121c0bd: 222 }, { #c1127ea9: 53, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 223 }, { #c1127ea9: 155, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 224 }, { #c1127ea9: 155 })>,
-        <#d80cb60b: ({ #d121c0bd: 225 }, 226)>,
+        <#2e6cf4ea: ({ #d121c0bd: 208 })>,
+        <#2e6cf4ea: ({ #d121c0bd: 209 })>,
+        <#22d546dd: ({ #d121c0bd: 210 }, <#c9ba0f87>)>,
+        <#22d546dd: ({ #d121c0bd: 211 }, <#db21580c>)>,
+        <#22d546dd: ({ #d121c0bd: 212 }, <#391b1e6e>)>,
+        <#d3d219f7: ({ #d121c0bd: 213 }, { #c1127ea9: 99 })>,
+        <#22d546dd: ({ #d121c0bd: 214 }, <#ea323187>)>,
+        <#22d546dd: ({ #d121c0bd: 215 }, <#2fe155d3>)>,
+        <#22d546dd: ({ #d121c0bd: 216 }, <#f65b235f>)>,
+        <#d3d219f7: ({ #d121c0bd: 217 }, { #c1127ea9: 212 })>,
+        <#0098a8c5: ({ #d121c0bd: 218 }, { #fcd148e8: 210 })>,
+        <#2e3d736c: ({ #d121c0bd: 219 }, { #c1127ea9: 218 })>,
+        <#0098a8c5: ({ #d121c0bd: 220 }, { #fcd148e8: 211 })>,
+        <#2e3d736c: ({ #d121c0bd: 221 }, { #c1127ea9: 220 })>,
+        <#2374f4e7: ({ #d121c0bd: 222 }, 10)>,
+        <#d80cb60b: ({ #d121c0bd: 223 }, 224)>,
+        <#d3d219f7: ({ #d121c0bd: 225 }, { #c1127ea9: 53, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 226 }, { #c1127ea9: 157, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 227 }, { #c1127ea9: 157 })>,
+        <#d80cb60b: ({ #d121c0bd: 228 }, 229)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 227 },
-            { #cd26765d: { #c1127ea9: 225 }, #11302019: 24 },
+           ({ #d121c0bd: 230 },
+            { #cd26765d: { #c1127ea9: 228 }, #11302019: 24 },
             1)>,
-        <#2374f4e7: ({ #d121c0bd: 228 }, 18)>,
+        <#2374f4e7: ({ #d121c0bd: 231 }, 18)>,
         <#19e1ef85:
-           ({ #d121c0bd: 7, #26f32be5: 216 },
-            { #0b680f7d: { #c1127ea9: 216 }, #c3687459: 6 })>,
+           ({ #d121c0bd: 7, #26f32be5: 219 },
+            { #0b680f7d: { #c1127ea9: 219 }, #c3687459: 6 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 21, #26f32be5: 216 },
-            { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 153 })>,
+           ({ #d121c0bd: 21, #26f32be5: 219 },
+            { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 155 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 9, #26f32be5: 218 },
-            { #0b680f7d: { #c1127ea9: 218 }, #c3687459: 8 })>,
+           ({ #d121c0bd: 9, #26f32be5: 221 },
+            { #0b680f7d: { #c1127ea9: 221 }, #c3687459: 8 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 5, #26f32be5: 214 },
-            { #0b680f7d: { #c1127ea9: 214 }, #c3687459: 4 })>,
-        <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 228 })>,
+           ({ #d121c0bd: 5, #26f32be5: 217 },
+            { #0b680f7d: { #c1127ea9: 217 }, #c3687459: 4 })>,
+        <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 231 })>,
         <#19e1ef85:
            ({ #d121c0bd: 15, #26f32be5: 53 },
             { #0b680f7d: { #c1127ea9: 53 }, #c3687459: 14 })>,
-        <#2e3d736c: ({ #d121c0bd: 47 }, { #c1127ea9: 219 })>,
-        <#2374f4e7: ({ #d121c0bd: 229 }, 50)>,
-        <#2374f4e7: ({ #d121c0bd: 230 }, 56)>,
+        <#2e3d736c: ({ #d121c0bd: 47 }, { #c1127ea9: 222 })>,
+        <#2374f4e7: ({ #d121c0bd: 232 }, 50)>,
+        <#2374f4e7: ({ #d121c0bd: 233 }, 56)>,
         <#19e1ef85:
            ({ #d121c0bd: 17, #26f32be5: 79 },
             { #0b680f7d: { #c1127ea9: 79 }, #c3687459: 16 })>,
-        <#2e3d736c: ({ #d121c0bd: 59 }, { #c1127ea9: 230 })>,
-        <#2374f4e7: ({ #d121c0bd: 231 }, 61)>,
+        <#2e3d736c: ({ #d121c0bd: 59 }, { #c1127ea9: 233 })>,
+        <#2374f4e7: ({ #d121c0bd: 234 }, 61)>,
         <#cd01b755:
-           ({ #d121c0bd: 232 },
-            { #cd26765d: { #c1127ea9: 216 }, #11302019: 8 })>,
+           ({ #d121c0bd: 235 },
+            { #cd26765d: { #c1127ea9: 219 }, #11302019: 8 })>,
         <#cd01b755:
-           ({ #d121c0bd: 233 },
+           ({ #d121c0bd: 236 },
             { #cd26765d: { #c1127ea9: 7, #ea1a680e: true }, #11302019: 8 })>,
         <#cd01b755:
-           ({ #d121c0bd: 234 },
+           ({ #d121c0bd: 237 },
             { #cd26765d: { #c1127ea9: 7, #ea1a680e: true }, #11302019: 8 })>,
-        <#d3d219f7: ({ #d121c0bd: 235 }, { #c1127ea9: 216, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 236 }, { #c1127ea9: 7, #ea1a680e: true })>,
-        <#2d935553: ({ #d121c0bd: 64, #26f32be5: 236 }, { #c1127ea9: 236 })>,
-        <#2e3d736c: ({ #d121c0bd: 72 }, { #c1127ea9: 231 })>,
-        <#2374f4e7: ({ #d121c0bd: 237 }, 74)>,
-        <#d3d219f7: ({ #d121c0bd: 238 }, { #c1127ea9: 216 })>,
+        <#d3d219f7: ({ #d121c0bd: 238 }, { #c1127ea9: 219, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 239 }, { #c1127ea9: 7, #ea1a680e: true })>,
+        <#2d935553: ({ #d121c0bd: 64, #26f32be5: 239 }, { #c1127ea9: 239 })>,
+        <#2e3d736c: ({ #d121c0bd: 72 }, { #c1127ea9: 234 })>,
+        <#2374f4e7: ({ #d121c0bd: 240 }, 74)>,
+        <#d3d219f7: ({ #d121c0bd: 241 }, { #c1127ea9: 219 })>,
         <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 7 })>,
-        <#2e3d736c: ({ #d121c0bd: 85 }, { #c1127ea9: 237 })>,
-        <#2374f4e7: ({ #d121c0bd: 239 }, 87)>,
+        <#2e3d736c: ({ #d121c0bd: 85 }, { #c1127ea9: 240 })>,
+        <#2374f4e7: ({ #d121c0bd: 242 }, 87)>,
         <#26796f6a:
-           ({ #d121c0bd: 240 },
-            { #f9c96be9: { #c1127ea9: 97 } },
+           ({ #d121c0bd: 243 },
+            { #f9c96be9: { #c1127ea9: 99 } },
             { #08ec7593: [ { #c1127ea9: 59 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 241 },
-            { #f9c96be9: { #c1127ea9: 97 } },
+           ({ #d121c0bd: 244 },
+            { #f9c96be9: { #c1127ea9: 99 } },
             { #08ec7593: [ { #c1127ea9: 59 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 242 },
-            { #f9c96be9: { #c1127ea9: 97 } },
-            { #08ec7593: [ { #c1127ea9: 216 } ] })>,
+           ({ #d121c0bd: 245 },
+            { #f9c96be9: { #c1127ea9: 99 } },
+            { #08ec7593: [ { #c1127ea9: 219 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 90 },
-            { #f9c96be9: { #c1127ea9: 97 } },
+           ({ #d121c0bd: 91 },
+            { #f9c96be9: { #c1127ea9: 99 } },
             { #08ec7593: [ { #c1127ea9: 7 } ] })>,
-        <#2374f4e7: ({ #d121c0bd: 148 }, 95)>,
-        <#2e3d736c: ({ #d121c0bd: 100 }, { #c1127ea9: 148 })>,
+        <#2374f4e7: ({ #d121c0bd: 150 }, 97)>,
+        <#2e3d736c: ({ #d121c0bd: 102 }, { #c1127ea9: 150 })>,
         <#da0c5ecf:
-           ({ #d121c0bd: 121 },
-            { #cd26765d: { #c1127ea9: 155 }, #11302019: 1 },
+           ({ #d121c0bd: 123 },
+            { #cd26765d: { #c1127ea9: 157 }, #11302019: 1 },
             19)>,
-        <#d3d219f7: ({ #d121c0bd: 243 }, { #c1127ea9: 242 })>,
-        <#d3d219f7: ({ #d121c0bd: 117 }, { #c1127ea9: 90 })>,
+        <#d3d219f7: ({ #d121c0bd: 246 }, { #c1127ea9: 245 })>,
+        <#d3d219f7: ({ #d121c0bd: 119 }, { #c1127ea9: 91 })>,
         <#cd01b755:
-           ({ #d121c0bd: 244 },
-            { #cd26765d: { #c1127ea9: 224 }, #11302019: 8 })>,
-        <#d3d219f7: ({ #d121c0bd: 245 }, { #c1127ea9: 224 })>,
-        <#2d935553: ({ #d121c0bd: 128, #26f32be5: 245 }, { #c1127ea9: 245 })>,
+           ({ #d121c0bd: 247 },
+            { #cd26765d: { #c1127ea9: 227 }, #11302019: 8 })>,
+        <#d3d219f7: ({ #d121c0bd: 248 }, { #c1127ea9: 227 })>,
+        <#2d935553: ({ #d121c0bd: 130, #26f32be5: 248 }, { #c1127ea9: 248 })>,
         <#26796f6a:
-           ({ #d121c0bd: 246 },
+           ({ #d121c0bd: 249 },
             { #f9c96be9: { #c1127ea9: 53 } },
-            { #08ec7593: [ { #c1127ea9: 53 }, { #c1127ea9: 245 } ] })>,
+            { #08ec7593: [ { #c1127ea9: 53 }, { #c1127ea9: 248 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 125 },
+           ({ #d121c0bd: 127 },
             { #f9c96be9: { #c1127ea9: 53 } },
-            { #08ec7593: [ { #c1127ea9: 53 }, { #c1127ea9: 128 } ] })>,
+            { #08ec7593: [ { #c1127ea9: 53 }, { #c1127ea9: 130 } ] })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCBridgeTransferTest.m.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCBridgeTransferTest.m.exp
index ed36723f5..3f8a47bbb 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCBridgeTransferTest.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCBridgeTransferTest.m.exp
@@ -779,20 +779,21 @@
             #21793419: ({ #c7b317f4: 52, #c68b4ed6: 13 }, { #c68b4ed6: 13 }),
             #eb8a1f5a: true,
             #1771a8d7: [
+              <#16427154: ({ #d121c0bd: 89, #21793419: ({ }, { }) })>,
               <#f68c4428:
                  ({
-                    #d121c0bd: 89,
+                    #d121c0bd: 90,
                     #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 13 })
                   })>
             ]
           },
           { #c8ff724b: "NSLog", #2cdb06fb: [ "NSLog" ] },
-          { #c1127ea9: 90 },
+          { #c1127ea9: 91 },
           {
             #ed526254: true,
             #d17ebeaa: [
               <#fd75cc45:
-                 ({ #d121c0bd: 91, #21793419: ({ }, { }) },
+                 ({ #d121c0bd: 92, #21793419: ({ }, { }) },
                   { #c8ff724b: "", #2cdb06fb: [ "" ] },
                   { #c1127ea9: 7 },
                   { #0370b1b2: 0 })>
@@ -800,24 +801,25 @@
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 92,
+            #d121c0bd: 93,
             #21793419: ({ #c68b4ed6: 1 }, { #c68b4ed6: 34 }),
             #1771a8d7: [
+              <#16427154: ({ #d121c0bd: 94, #21793419: ({ }, { }) })>,
               <#f68c4428:
                  ({
-                    #d121c0bd: 93,
+                    #d121c0bd: 95,
                     #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 13 })
                   })>
             ]
           },
           { #c8ff724b: "NSLog", #2cdb06fb: [ "NSLog" ] },
-          { #c1127ea9: 90 },
+          { #c1127ea9: 91 },
           {
             #ed526254: true,
             #d17ebeaa: [
               <#fd75cc45:
                  ({
-                    #d121c0bd: 94,
+                    #d121c0bd: 96,
                     #21793419: ({ #c68b4ed6: 19 }, { #c68b4ed6: 28 })
                   },
                   { #c8ff724b: "", #2cdb06fb: [ "" ] },
@@ -827,7 +829,7 @@
           })>,
       <#cd6a13bb:
          ({
-            #d121c0bd: 95,
+            #d121c0bd: 97,
             #f9005968: 1,
             #21793419:
               ({
@@ -838,25 +840,25 @@
                { #c7b317f4: 11, #c68b4ed6: 1 })
           },
           { #c8ff724b: "ABFDataRef", #2cdb06fb: [ "ABFDataRef" ] },
-          96,
+          98,
           [],
           { },
           <#c5b1f8a9>,
-          { #33244202: 95, #1a9a7e84: true })>,
+          { #33244202: 97, #1a9a7e84: true })>,
       <#0f3f4d35:
          ({
-            #d121c0bd: 97,
+            #d121c0bd: 99,
             #21793419:
               ({ #c7b317f4: 10, #c68b4ed6: 1 },
                { #c7b317f4: 11, #c68b4ed6: 3 }),
             #d3368c8a: true
           },
           { #c8ff724b: "ABFDataRef", #2cdb06fb: [ "ABFDataRef" ] },
-          98,
+          100,
           { })>,
       <#18d25297:
          ({
-            #d121c0bd: 99,
+            #d121c0bd: 101,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 13, #c68b4ed6: 1 },
@@ -868,17 +870,17 @@
           { })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 100,
+            #d121c0bd: 102,
             #21793419: ({ #c7b317f4: 16, #c68b4ed6: 1 }, { #c68b4ed6: 27 }),
             #0a16e1f2: true,
             #d3368c8a: true
           },
           { #c8ff724b: "ABFDataCreate", #2cdb06fb: [ "ABFDataCreate" ] },
-          { #c1127ea9: 101 },
+          { #c1127ea9: 103 },
           { })>,
       <#18d25297:
          ({
-            #d121c0bd: 102,
+            #d121c0bd: 104,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 18, #c68b4ed6: 1 },
@@ -895,13 +897,13 @@
             },
             #d32dd232: {
               #c709e154: <#c37c57de>,
-              #ec05e4a8: 103,
+              #ec05e4a8: 105,
               #c8ff724b: { #c8ff724b: "A", #2cdb06fb: [ "A" ] }
             }
           })>,
       <#0e281b68:
          ({
-            #d121c0bd: 103,
+            #d121c0bd: 105,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 21, #c68b4ed6: 1 },
@@ -911,8 +913,8 @@
           [
             <#3ccd3797:
                ({
-                  #d121c0bd: 104,
-                  #f9005968: 103,
+                  #d121c0bd: 106,
+                  #f9005968: 105,
                   #21793419:
                     ({ #c7b317f4: 23, #c68b4ed6: 1 },
                      { #c7b317f4: 25, #c68b4ed6: 1 })
@@ -923,20 +925,20 @@
                 },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 105 },
+                  #137b649c: { #c1127ea9: 107 },
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 106,
+                          #d121c0bd: 108,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 107, #ea1a680e: true },
+                        { #c1127ea9: 109, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 108,
+                          #d121c0bd: 110,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -947,7 +949,7 @@
                   #c11b7aa2:
                     <#d394bb73:
                        ({
-                          #d121c0bd: 109,
+                          #d121c0bd: 111,
                           #21793419:
                             ({ #c7b317f4: 23, #c68b4ed6: 33 },
                              { #c7b317f4: 25, #c68b4ed6: 1 })
@@ -955,7 +957,7 @@
                         [
                           <#152ea3f2:
                              ({
-                                #d121c0bd: 110,
+                                #d121c0bd: 112,
                                 #21793419:
                                   ({ #c7b317f4: 24, #c68b4ed6: 3 },
                                    { #c68b4ed6: 66 })
@@ -963,14 +965,14 @@
                               [
                                 <#d0cddcea:
                                    ({
-                                      #d121c0bd: 111,
+                                      #d121c0bd: 113,
                                       #21793419:
                                         ({ #c68b4ed6: 23 }, { #c68b4ed6: 65 })
                                     },
                                     [
                                       <#c3b129f9:
                                          ({
-                                            #d121c0bd: 112,
+                                            #d121c0bd: 114,
                                             #21793419:
                                               ({ #c68b4ed6: 23 },
                                                { #c68b4ed6: 65 })
@@ -978,7 +980,7 @@
                                           [
                                             <#23214b43:
                                                ({
-                                                  #d121c0bd: 113,
+                                                  #d121c0bd: 115,
                                                   #21793419:
                                                     ({ #c68b4ed6: 23 },
                                                      { #c68b4ed6: 65 })
@@ -986,7 +988,7 @@
                                                 [
                                                   <#c59ea513:
                                                      ({
-                                                        #d121c0bd: 114,
+                                                        #d121c0bd: 116,
                                                         #21793419:
                                                           ({ #c68b4ed6: 51 },
                                                            { #c68b4ed6: 65 })
@@ -994,7 +996,7 @@
                                                       [
                                                         <#c3b129f9:
                                                            ({
-                                                              #d121c0bd: 115,
+                                                              #d121c0bd: 117,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -1009,7 +1011,7 @@
                                                               <#e9db58be:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    116,
+                                                                    118,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -1025,7 +1027,7 @@
                                                                   {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    101
+                                                                    103
                                                                     }
                                                                   },
                                                                   {
@@ -1033,7 +1035,7 @@
                                                                     #c709e154:
                                                                     <#ee046738>,
                                                                     #ec05e4a8:
-                                                                    100,
+                                                                    102,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "ABFDataCreate",
@@ -1043,7 +1045,7 @@
                                                                     },
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    101
+                                                                    103
                                                                     }
                                                                     }
                                                                   })>
@@ -1051,7 +1053,7 @@
                                                             {
                                                               #30e4876a: {
                                                                 #c1127ea9:
-                                                                  117
+                                                                  119
                                                               }
                                                             },
                                                             {
@@ -1062,35 +1064,35 @@
                                                       ],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 118
+                                                          #c1127ea9: 120
                                                         }
                                                       })>
                                                 ],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 119
+                                                    #c1127ea9: 121
                                                   }
                                                 },
                                                 {
                                                   #c91e0a14: <#eb29e9bb>,
                                                   #fa1a3bd3: []
                                                 },
-                                                { #c1127ea9: 119 },
+                                                { #c1127ea9: 121 },
                                                 { #c91e0a14: <#34cf37c3> })>
                                           ],
-                                          { #30e4876a: { #c1127ea9: 119 } },
+                                          { #30e4876a: { #c1127ea9: 121 } },
                                           {
                                             #c91e0a14: <#38332009>,
                                             #fa1a3bd3: []
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 119 } },
+                                    { #30e4876a: { #c1127ea9: 121 } },
                                     { })>
                               ],
                               [
                                 <#11c182d1:
                                    ({
-                                      #d121c0bd: 120,
+                                      #d121c0bd: 122,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 65 })
                                     },
@@ -1098,12 +1100,12 @@
                                       #c8ff724b: "someData",
                                       #2cdb06fb: [ "someData" ]
                                     },
-                                    { #c1127ea9: 119 },
+                                    { #c1127ea9: 121 },
                                     {
                                       #fe93c404:
                                         <#d0cddcea:
                                            ({
-                                              #d121c0bd: 111,
+                                              #d121c0bd: 113,
                                               #21793419:
                                                 ({ #c68b4ed6: 23 },
                                                  { #c68b4ed6: 65 })
@@ -1111,7 +1113,7 @@
                                             [
                                               <#c3b129f9:
                                                  ({
-                                                    #d121c0bd: 112,
+                                                    #d121c0bd: 114,
                                                     #21793419:
                                                       ({ #c68b4ed6: 23 },
                                                        { #c68b4ed6: 65 })
@@ -1119,7 +1121,7 @@
                                                   [
                                                     <#23214b43:
                                                        ({
-                                                          #d121c0bd: 113,
+                                                          #d121c0bd: 115,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 23
@@ -1132,7 +1134,7 @@
                                                           <#c59ea513:
                                                              ({
                                                                 #d121c0bd:
-                                                                  114,
+                                                                  116,
                                                                 #21793419:
                                                                   ({
                                                                     #c68b4ed6:
@@ -1147,7 +1149,7 @@
                                                                 <#c3b129f9:
                                                                    ({
                                                                     #d121c0bd:
-                                                                    115,
+                                                                    117,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -1163,7 +1165,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    116,
+                                                                    118,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -1179,7 +1181,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    101
+                                                                    103
                                                                     }
                                                                     },
                                                                     {
@@ -1187,7 +1189,7 @@
                                                                     #c709e154:
                                                                     <#ee046738>,
                                                                     #ec05e4a8:
-                                                                    100,
+                                                                    102,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "ABFDataCreate",
@@ -1197,7 +1199,7 @@
                                                                     },
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    101
+                                                                    103
                                                                     }
                                                                     }
                                                                     })>
@@ -1205,7 +1207,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    117
+                                                                    119
                                                                     }
                                                                     },
                                                                     {
@@ -1218,13 +1220,13 @@
                                                               {
                                                                 #30e4876a: {
                                                                   #c1127ea9:
-                                                                    118
+                                                                    120
                                                                 }
                                                               })>
                                                         ],
                                                         {
                                                           #30e4876a: {
-                                                            #c1127ea9: 119
+                                                            #c1127ea9: 121
                                                           }
                                                         },
                                                         {
@@ -1232,7 +1234,7 @@
                                                             <#eb29e9bb>,
                                                           #fa1a3bd3: []
                                                         },
-                                                        { #c1127ea9: 119 },
+                                                        { #c1127ea9: 121 },
                                                         {
                                                           #c91e0a14:
                                                             <#34cf37c3>
@@ -1240,7 +1242,7 @@
                                                   ],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 119
+                                                      #c1127ea9: 121
                                                     }
                                                   },
                                                   {
@@ -1248,7 +1250,7 @@
                                                     #fa1a3bd3: []
                                                   })>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 119 } },
+                                            { #30e4876a: { #c1127ea9: 121 } },
                                             { })>
                                     })>
                               ])>
@@ -1260,12 +1262,12 @@
           {
             #2ec29bb2: {
               #c709e154: <#3cf18b8d>,
-              #ec05e4a8: 102,
+              #ec05e4a8: 104,
               #c8ff724b: { #c8ff724b: "A", #2cdb06fb: [ "A" ] }
             }
           })>,
       <#0f3f4d35:
-         ({ #d121c0bd: 121, #21793419: ({ }, { }), #eb8a1f5a: true },
+         ({ #d121c0bd: 123, #21793419: ({ }, { }), #eb8a1f5a: true },
           { #c8ff724b: "instancetype", #2cdb06fb: [ "instancetype" ] },
           21,
           { })>
@@ -1283,158 +1285,159 @@
       },
       #247f0baa: true,
       #1acb7079: [
-        <#22d546dd: ({ #d121c0bd: 105 }, <#392cef74>)>,
-        <#22d546dd: ({ #d121c0bd: 122 }, <#2bf4b04a>)>,
-        <#22d546dd: ({ #d121c0bd: 123 }, <#ec0a078a>)>,
-        <#22d546dd: ({ #d121c0bd: 124 }, <#f6dab0c9>)>,
-        <#22d546dd: ({ #d121c0bd: 125 }, <#0f54f45c>)>,
+        <#22d546dd: ({ #d121c0bd: 107 }, <#392cef74>)>,
+        <#22d546dd: ({ #d121c0bd: 124 }, <#2bf4b04a>)>,
+        <#22d546dd: ({ #d121c0bd: 125 }, <#ec0a078a>)>,
+        <#22d546dd: ({ #d121c0bd: 126 }, <#f6dab0c9>)>,
+        <#22d546dd: ({ #d121c0bd: 127 }, <#0f54f45c>)>,
         <#22d546dd: ({ #d121c0bd: 53 }, <#0037c4cf>)>,
-        <#22d546dd: ({ #d121c0bd: 126 }, <#3290d19c>)>,
-        <#22d546dd: ({ #d121c0bd: 127 }, <#fee0a138>)>,
-        <#22d546dd: ({ #d121c0bd: 128 }, <#1da7d9cb>)>,
-        <#22d546dd: ({ #d121c0bd: 129 }, <#0baa9fe7>)>,
+        <#22d546dd: ({ #d121c0bd: 128 }, <#3290d19c>)>,
+        <#22d546dd: ({ #d121c0bd: 129 }, <#fee0a138>)>,
+        <#22d546dd: ({ #d121c0bd: 130 }, <#1da7d9cb>)>,
+        <#22d546dd: ({ #d121c0bd: 131 }, <#0baa9fe7>)>,
         <#22d546dd: ({ #d121c0bd: 79 }, <#3866e79a>)>,
-        <#22d546dd: ({ #d121c0bd: 130 }, <#23a02071>)>,
-        <#22d546dd: ({ #d121c0bd: 131 }, <#09087e8d>)>,
-        <#22d546dd: ({ #d121c0bd: 132 }, <#15c4357c>)>,
-        <#22d546dd: ({ #d121c0bd: 133 }, <#e75f9f31>)>,
-        <#22d546dd: ({ #d121c0bd: 134 }, <#c2f78dcd>)>,
-        <#22d546dd: ({ #d121c0bd: 135 }, <#3726ba3b>)>,
-        <#22d546dd: ({ #d121c0bd: 136 }, <#3759b761>)>,
-        <#22d546dd: ({ #d121c0bd: 137 }, <#ebd317dd>)>,
-        <#22d546dd: ({ #d121c0bd: 138 }, <#2ec759b9>)>,
-        <#22d546dd: ({ #d121c0bd: 139 }, <#284d329d>)>,
-        <#22d546dd: ({ #d121c0bd: 140 }, <#35acb472>)>,
-        <#22d546dd: ({ #d121c0bd: 141 }, <#2b1d0544>)>,
-        <#22d546dd: ({ #d121c0bd: 142 }, <#0106ffa8>)>,
-        <#22d546dd: ({ #d121c0bd: 143 }, <#d6bc9d8a>)>,
-        <#22d546dd: ({ #d121c0bd: 144 }, <#19b0df66>)>,
-        <#22d546dd: ({ #d121c0bd: 145 }, <#1336b84a>)>,
-        <#22d546dd: ({ #d121c0bd: 146 }, <#20963a1f>)>,
-        <#22d546dd: ({ #d121c0bd: 147 }, <#16068af1>)>,
-        <#22d546dd: ({ #d121c0bd: 148 }, <#ebf08555>)>,
-        <#22d546dd: ({ #d121c0bd: 149 }, <#d78ceb63>)>,
-        <#22d546dd: ({ #d121c0bd: 150 }, <#dd2a33f3>)>,
-        <#22d546dd: ({ #d121c0bd: 151 }, <#ef62b1d7>)>,
-        <#22d546dd: ({ #d121c0bd: 152 }, <#0c8bf62c>)>,
-        <#22d546dd: ({ #d121c0bd: 153 }, <#13391dca>)>,
-        <#22d546dd: ({ #d121c0bd: 154 }, <#ecc0d32e>)>,
-        <#22d546dd: ({ #d121c0bd: 155 }, <#c2767110>)>,
-        <#22d546dd: ({ #d121c0bd: 156 }, <#c813b9a0>)>,
-        <#22d546dd: ({ #d121c0bd: 157 }, <#da4c3784>)>,
-        <#22d546dd: ({ #d121c0bd: 158 }, <#f7757bd9>)>,
-        <#22d546dd: ({ #d121c0bd: 159 }, <#fe22a377>)>,
-        <#22d546dd: ({ #d121c0bd: 160 }, <#d7aa58db>)>,
-        <#22d546dd: ({ #d121c0bd: 161 }, <#d2f340c8>)>,
-        <#22d546dd: ({ #d121c0bd: 162 }, <#2193aedd>)>,
-        <#22d546dd: ({ #d121c0bd: 163 }, <#0dd56321>)>,
-        <#22d546dd: ({ #d121c0bd: 164 }, <#d8e10c82>)>,
-        <#22d546dd: ({ #d121c0bd: 165 }, <#c4f079df>)>,
-        <#22d546dd: ({ #d121c0bd: 166 }, <#1ee7219a>)>,
-        <#22d546dd: ({ #d121c0bd: 167 }, <#0d506118>)>,
-        <#22d546dd: ({ #d121c0bd: 168 }, <#dec9bcfd>)>,
-        <#22d546dd: ({ #d121c0bd: 169 }, <#f1f6e5a2>)>,
-        <#22d546dd: ({ #d121c0bd: 170 }, <#d935d0cf>)>,
-        <#22d546dd: ({ #d121c0bd: 171 }, <#d35a4eab>)>,
-        <#2e6cf4ea: ({ #d121c0bd: 172 })>,
-        <#2e6cf4ea: ({ #d121c0bd: 173 })>,
+        <#22d546dd: ({ #d121c0bd: 132 }, <#23a02071>)>,
+        <#22d546dd: ({ #d121c0bd: 133 }, <#09087e8d>)>,
+        <#22d546dd: ({ #d121c0bd: 134 }, <#15c4357c>)>,
+        <#22d546dd: ({ #d121c0bd: 135 }, <#e75f9f31>)>,
+        <#22d546dd: ({ #d121c0bd: 136 }, <#c2f78dcd>)>,
+        <#22d546dd: ({ #d121c0bd: 137 }, <#3726ba3b>)>,
+        <#22d546dd: ({ #d121c0bd: 138 }, <#3759b761>)>,
+        <#22d546dd: ({ #d121c0bd: 139 }, <#ebd317dd>)>,
+        <#22d546dd: ({ #d121c0bd: 140 }, <#2ec759b9>)>,
+        <#22d546dd: ({ #d121c0bd: 141 }, <#284d329d>)>,
+        <#22d546dd: ({ #d121c0bd: 142 }, <#35acb472>)>,
+        <#22d546dd: ({ #d121c0bd: 143 }, <#2b1d0544>)>,
+        <#22d546dd: ({ #d121c0bd: 144 }, <#0106ffa8>)>,
+        <#22d546dd: ({ #d121c0bd: 145 }, <#d6bc9d8a>)>,
+        <#22d546dd: ({ #d121c0bd: 146 }, <#19b0df66>)>,
+        <#22d546dd: ({ #d121c0bd: 147 }, <#1336b84a>)>,
+        <#22d546dd: ({ #d121c0bd: 148 }, <#20963a1f>)>,
+        <#22d546dd: ({ #d121c0bd: 149 }, <#16068af1>)>,
+        <#22d546dd: ({ #d121c0bd: 150 }, <#ebf08555>)>,
+        <#22d546dd: ({ #d121c0bd: 151 }, <#d78ceb63>)>,
+        <#22d546dd: ({ #d121c0bd: 152 }, <#dd2a33f3>)>,
+        <#22d546dd: ({ #d121c0bd: 153 }, <#ef62b1d7>)>,
+        <#22d546dd: ({ #d121c0bd: 154 }, <#0c8bf62c>)>,
+        <#22d546dd: ({ #d121c0bd: 155 }, <#13391dca>)>,
+        <#22d546dd: ({ #d121c0bd: 156 }, <#ecc0d32e>)>,
+        <#22d546dd: ({ #d121c0bd: 157 }, <#c2767110>)>,
+        <#22d546dd: ({ #d121c0bd: 158 }, <#c813b9a0>)>,
+        <#22d546dd: ({ #d121c0bd: 159 }, <#da4c3784>)>,
+        <#22d546dd: ({ #d121c0bd: 160 }, <#f7757bd9>)>,
+        <#22d546dd: ({ #d121c0bd: 161 }, <#fe22a377>)>,
+        <#22d546dd: ({ #d121c0bd: 162 }, <#d7aa58db>)>,
+        <#22d546dd: ({ #d121c0bd: 163 }, <#d2f340c8>)>,
+        <#22d546dd: ({ #d121c0bd: 164 }, <#2193aedd>)>,
+        <#22d546dd: ({ #d121c0bd: 165 }, <#0dd56321>)>,
+        <#22d546dd: ({ #d121c0bd: 166 }, <#d8e10c82>)>,
+        <#22d546dd: ({ #d121c0bd: 167 }, <#c4f079df>)>,
+        <#22d546dd: ({ #d121c0bd: 168 }, <#1ee7219a>)>,
+        <#22d546dd: ({ #d121c0bd: 169 }, <#0d506118>)>,
+        <#22d546dd: ({ #d121c0bd: 170 }, <#dec9bcfd>)>,
+        <#22d546dd: ({ #d121c0bd: 171 }, <#f1f6e5a2>)>,
+        <#22d546dd: ({ #d121c0bd: 172 }, <#d935d0cf>)>,
+        <#22d546dd: ({ #d121c0bd: 173 }, <#d35a4eab>)>,
         <#2e6cf4ea: ({ #d121c0bd: 174 })>,
         <#2e6cf4ea: ({ #d121c0bd: 175 })>,
-        <#22d546dd: ({ #d121c0bd: 176 }, <#c9ba0f87>)>,
-        <#22d546dd: ({ #d121c0bd: 177 }, <#db21580c>)>,
-        <#22d546dd: ({ #d121c0bd: 178 }, <#391b1e6e>)>,
-        <#d3d219f7: ({ #d121c0bd: 179 }, { #c1127ea9: 105 })>,
-        <#22d546dd: ({ #d121c0bd: 180 }, <#ea323187>)>,
-        <#22d546dd: ({ #d121c0bd: 181 }, <#2fe155d3>)>,
-        <#d3d219f7: ({ #d121c0bd: 182 }, { #c1127ea9: 178 })>,
-        <#0098a8c5: ({ #d121c0bd: 183 }, { #fcd148e8: 176 })>,
-        <#2e3d736c: ({ #d121c0bd: 184 }, { #c1127ea9: 183 })>,
-        <#0098a8c5: ({ #d121c0bd: 185 }, { #fcd148e8: 177 })>,
-        <#2e3d736c: ({ #d121c0bd: 186 }, { #c1127ea9: 185 })>,
-        <#2374f4e7: ({ #d121c0bd: 187 }, 10)>,
-        <#d80cb60b: ({ #d121c0bd: 188 }, 189)>,
-        <#d3d219f7: ({ #d121c0bd: 190 }, { #c1127ea9: 53, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 191 }, { #c1127ea9: 123, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 192 }, { #c1127ea9: 123 })>,
-        <#d80cb60b: ({ #d121c0bd: 193 }, 194)>,
+        <#2e6cf4ea: ({ #d121c0bd: 176 })>,
+        <#2e6cf4ea: ({ #d121c0bd: 177 })>,
+        <#22d546dd: ({ #d121c0bd: 178 }, <#c9ba0f87>)>,
+        <#22d546dd: ({ #d121c0bd: 179 }, <#db21580c>)>,
+        <#22d546dd: ({ #d121c0bd: 180 }, <#391b1e6e>)>,
+        <#d3d219f7: ({ #d121c0bd: 181 }, { #c1127ea9: 107 })>,
+        <#22d546dd: ({ #d121c0bd: 182 }, <#ea323187>)>,
+        <#22d546dd: ({ #d121c0bd: 183 }, <#2fe155d3>)>,
+        <#22d546dd: ({ #d121c0bd: 184 }, <#f65b235f>)>,
+        <#d3d219f7: ({ #d121c0bd: 185 }, { #c1127ea9: 180 })>,
+        <#0098a8c5: ({ #d121c0bd: 186 }, { #fcd148e8: 178 })>,
+        <#2e3d736c: ({ #d121c0bd: 187 }, { #c1127ea9: 186 })>,
+        <#0098a8c5: ({ #d121c0bd: 188 }, { #fcd148e8: 179 })>,
+        <#2e3d736c: ({ #d121c0bd: 189 }, { #c1127ea9: 188 })>,
+        <#2374f4e7: ({ #d121c0bd: 190 }, 10)>,
+        <#d80cb60b: ({ #d121c0bd: 191 }, 192)>,
+        <#d3d219f7: ({ #d121c0bd: 193 }, { #c1127ea9: 53, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 194 }, { #c1127ea9: 125, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 195 }, { #c1127ea9: 125 })>,
+        <#d80cb60b: ({ #d121c0bd: 196 }, 197)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 195 },
-            { #cd26765d: { #c1127ea9: 193 }, #11302019: 24 },
+           ({ #d121c0bd: 198 },
+            { #cd26765d: { #c1127ea9: 196 }, #11302019: 24 },
             1)>,
-        <#2374f4e7: ({ #d121c0bd: 196 }, 18)>,
+        <#2374f4e7: ({ #d121c0bd: 199 }, 18)>,
         <#19e1ef85:
-           ({ #d121c0bd: 7, #26f32be5: 184 },
-            { #0b680f7d: { #c1127ea9: 184 }, #c3687459: 6 })>,
+           ({ #d121c0bd: 7, #26f32be5: 187 },
+            { #0b680f7d: { #c1127ea9: 187 }, #c3687459: 6 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 21, #26f32be5: 184 },
-            { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 121 })>,
+           ({ #d121c0bd: 21, #26f32be5: 187 },
+            { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 123 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 9, #26f32be5: 186 },
-            { #0b680f7d: { #c1127ea9: 186 }, #c3687459: 8 })>,
+           ({ #d121c0bd: 9, #26f32be5: 189 },
+            { #0b680f7d: { #c1127ea9: 189 }, #c3687459: 8 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 5, #26f32be5: 182 },
-            { #0b680f7d: { #c1127ea9: 182 }, #c3687459: 4 })>,
-        <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 196 })>,
+           ({ #d121c0bd: 5, #26f32be5: 185 },
+            { #0b680f7d: { #c1127ea9: 185 }, #c3687459: 4 })>,
+        <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 199 })>,
         <#19e1ef85:
            ({ #d121c0bd: 15, #26f32be5: 53 },
             { #0b680f7d: { #c1127ea9: 53 }, #c3687459: 14 })>,
-        <#2e3d736c: ({ #d121c0bd: 47 }, { #c1127ea9: 187 })>,
-        <#2374f4e7: ({ #d121c0bd: 197 }, 50)>,
-        <#2374f4e7: ({ #d121c0bd: 198 }, 56)>,
+        <#2e3d736c: ({ #d121c0bd: 47 }, { #c1127ea9: 190 })>,
+        <#2374f4e7: ({ #d121c0bd: 200 }, 50)>,
+        <#2374f4e7: ({ #d121c0bd: 201 }, 56)>,
         <#19e1ef85:
            ({ #d121c0bd: 17, #26f32be5: 79 },
             { #0b680f7d: { #c1127ea9: 79 }, #c3687459: 16 })>,
-        <#2e3d736c: ({ #d121c0bd: 59 }, { #c1127ea9: 198 })>,
-        <#2374f4e7: ({ #d121c0bd: 199 }, 61)>,
+        <#2e3d736c: ({ #d121c0bd: 59 }, { #c1127ea9: 201 })>,
+        <#2374f4e7: ({ #d121c0bd: 202 }, 61)>,
         <#cd01b755:
-           ({ #d121c0bd: 200 },
-            { #cd26765d: { #c1127ea9: 184 }, #11302019: 8 })>,
+           ({ #d121c0bd: 203 },
+            { #cd26765d: { #c1127ea9: 187 }, #11302019: 8 })>,
         <#cd01b755:
-           ({ #d121c0bd: 201 },
+           ({ #d121c0bd: 204 },
             { #cd26765d: { #c1127ea9: 7, #ea1a680e: true }, #11302019: 8 })>,
         <#cd01b755:
-           ({ #d121c0bd: 202 },
+           ({ #d121c0bd: 205 },
             { #cd26765d: { #c1127ea9: 7, #ea1a680e: true }, #11302019: 8 })>,
-        <#d3d219f7: ({ #d121c0bd: 203 }, { #c1127ea9: 184, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 204 }, { #c1127ea9: 7, #ea1a680e: true })>,
-        <#2d935553: ({ #d121c0bd: 64, #26f32be5: 204 }, { #c1127ea9: 204 })>,
-        <#2e3d736c: ({ #d121c0bd: 72 }, { #c1127ea9: 199 })>,
-        <#2374f4e7: ({ #d121c0bd: 205 }, 74)>,
-        <#d3d219f7: ({ #d121c0bd: 206 }, { #c1127ea9: 184 })>,
+        <#d3d219f7: ({ #d121c0bd: 206 }, { #c1127ea9: 187, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 207 }, { #c1127ea9: 7, #ea1a680e: true })>,
+        <#2d935553: ({ #d121c0bd: 64, #26f32be5: 207 }, { #c1127ea9: 207 })>,
+        <#2e3d736c: ({ #d121c0bd: 72 }, { #c1127ea9: 202 })>,
+        <#2374f4e7: ({ #d121c0bd: 208 }, 74)>,
+        <#d3d219f7: ({ #d121c0bd: 209 }, { #c1127ea9: 187 })>,
         <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 7 })>,
-        <#2e3d736c: ({ #d121c0bd: 85 }, { #c1127ea9: 205 })>,
-        <#2374f4e7: ({ #d121c0bd: 207 }, 87)>,
+        <#2e3d736c: ({ #d121c0bd: 85 }, { #c1127ea9: 208 })>,
+        <#2374f4e7: ({ #d121c0bd: 210 }, 87)>,
         <#26796f6a:
-           ({ #d121c0bd: 208 },
-            { #f9c96be9: { #c1127ea9: 105 } },
+           ({ #d121c0bd: 211 },
+            { #f9c96be9: { #c1127ea9: 107 } },
             { #08ec7593: [ { #c1127ea9: 59 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 209 },
-            { #f9c96be9: { #c1127ea9: 105 } },
+           ({ #d121c0bd: 212 },
+            { #f9c96be9: { #c1127ea9: 107 } },
             { #08ec7593: [ { #c1127ea9: 59 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 210 },
-            { #f9c96be9: { #c1127ea9: 105 } },
-            { #08ec7593: [ { #c1127ea9: 184 } ] })>,
+           ({ #d121c0bd: 213 },
+            { #f9c96be9: { #c1127ea9: 107 } },
+            { #08ec7593: [ { #c1127ea9: 187 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 90 },
-            { #f9c96be9: { #c1127ea9: 105 } },
+           ({ #d121c0bd: 91 },
+            { #f9c96be9: { #c1127ea9: 107 } },
             { #08ec7593: [ { #c1127ea9: 7 } ] })>,
-        <#d80cb60b: ({ #d121c0bd: 96 }, 95)>,
-        <#263b5f37: ({ #d121c0bd: 211, #26f32be5: 96 })>,
-        <#2374f4e7: ({ #d121c0bd: 212 }, 99)>,
+        <#d80cb60b: ({ #d121c0bd: 98 }, 97)>,
+        <#263b5f37: ({ #d121c0bd: 214, #26f32be5: 98 })>,
+        <#2374f4e7: ({ #d121c0bd: 215 }, 101)>,
         <#19e1ef85:
-           ({ #d121c0bd: 98, #26f32be5: 96 },
-            { #0b680f7d: { #c1127ea9: 211 }, #c3687459: 97 })>,
-        <#d3d219f7: ({ #d121c0bd: 213 }, { #c1127ea9: 96 })>,
-        <#d3d219f7: ({ #d121c0bd: 118 }, { #c1127ea9: 98 })>,
-        <#01fe18e9: ({ #d121c0bd: 214 }, { #f9c96be9: { #c1127ea9: 213 } })>,
-        <#01fe18e9: ({ #d121c0bd: 101 }, { #f9c96be9: { #c1127ea9: 118 } })>,
-        <#2374f4e7: ({ #d121c0bd: 215 }, 102)>,
-        <#2e3d736c: ({ #d121c0bd: 107 }, { #c1127ea9: 215 })>,
-        <#2e3d736c: ({ #d121c0bd: 119 }, { #c1127ea9: 212 })>,
-        <#d3d219f7: ({ #d121c0bd: 216 }, { #c1127ea9: 214 })>,
-        <#d3d219f7: ({ #d121c0bd: 117 }, { #c1127ea9: 101 })>,
+           ({ #d121c0bd: 100, #26f32be5: 98 },
+            { #0b680f7d: { #c1127ea9: 214 }, #c3687459: 99 })>,
+        <#d3d219f7: ({ #d121c0bd: 216 }, { #c1127ea9: 98 })>,
+        <#d3d219f7: ({ #d121c0bd: 120 }, { #c1127ea9: 100 })>,
+        <#01fe18e9: ({ #d121c0bd: 217 }, { #f9c96be9: { #c1127ea9: 216 } })>,
+        <#01fe18e9: ({ #d121c0bd: 103 }, { #f9c96be9: { #c1127ea9: 120 } })>,
+        <#2374f4e7: ({ #d121c0bd: 218 }, 104)>,
+        <#2e3d736c: ({ #d121c0bd: 109 }, { #c1127ea9: 218 })>,
+        <#2e3d736c: ({ #d121c0bd: 121 }, { #c1127ea9: 215 })>,
+        <#d3d219f7: ({ #d121c0bd: 219 }, { #c1127ea9: 217 })>,
+        <#d3d219f7: ({ #d121c0bd: 119 }, { #c1127ea9: 103 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCTest.m.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCTest.m.exp
index 3cde10d89..73531900f 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCTest.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCTest.m.exp
@@ -780,20 +780,21 @@
             #eb8a1f5a: true,
             #0a16e1f2: true,
             #1771a8d7: [
+              <#16427154: ({ #d121c0bd: 89, #21793419: ({ }, { }) })>,
               <#f68c4428:
                  ({
-                    #d121c0bd: 89,
+                    #d121c0bd: 90,
                     #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 13 })
                   })>
             ]
           },
           { #c8ff724b: "NSLog", #2cdb06fb: [ "NSLog" ] },
-          { #c1127ea9: 90 },
+          { #c1127ea9: 91 },
           {
             #ed526254: true,
             #d17ebeaa: [
               <#fd75cc45:
-                 ({ #d121c0bd: 91, #21793419: ({ }, { }) },
+                 ({ #d121c0bd: 92, #21793419: ({ }, { }) },
                   { #c8ff724b: "", #2cdb06fb: [ "" ] },
                   { #c1127ea9: 7 },
                   { #0370b1b2: 0 })>
@@ -801,26 +802,27 @@
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 92,
+            #d121c0bd: 93,
             #21793419: ({ #c68b4ed6: 1 }, { #c68b4ed6: 34 }),
             #0a16e1f2: true,
             #d3368c8a: true,
             #1771a8d7: [
+              <#16427154: ({ #d121c0bd: 94, #21793419: ({ }, { }) })>,
               <#f68c4428:
                  ({
-                    #d121c0bd: 93,
+                    #d121c0bd: 95,
                     #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 13 })
                   })>
             ]
           },
           { #c8ff724b: "NSLog", #2cdb06fb: [ "NSLog" ] },
-          { #c1127ea9: 90 },
+          { #c1127ea9: 91 },
           {
             #ed526254: true,
             #d17ebeaa: [
               <#fd75cc45:
                  ({
-                    #d121c0bd: 94,
+                    #d121c0bd: 96,
                     #21793419: ({ #c68b4ed6: 19 }, { #c68b4ed6: 28 })
                   },
                   { #c8ff724b: "", #2cdb06fb: [ "" ] },
@@ -830,7 +832,7 @@
           })>,
       <#e1b0618e:
          ({
-            #d121c0bd: 95,
+            #d121c0bd: 97,
             #f9005968: 1,
             #21793419:
               ({ #c3bbce7c: "tests/ObjCTest.m", #c7b317f4: 10, #c68b4ed6: 1 },
@@ -840,8 +842,8 @@
           [
             <#c5b2960b:
                ({
-                  #d121c0bd: 96,
-                  #f9005968: 95,
+                  #d121c0bd: 98,
+                  #f9005968: 97,
                   #21793419:
                     ({ #c7b317f4: 11, #c68b4ed6: 1 }, { #c68b4ed6: 38 })
                 },
@@ -850,7 +852,7 @@
                   #30e4876a: { #c1127ea9: 59 },
                   #3106f0d5: {
                     #c709e154: <#e655f08d>,
-                    #ec05e4a8: 97,
+                    #ec05e4a8: 99,
                     #c8ff724b: {
                       #c8ff724b: "str",
                       #2cdb06fb: [ "str", "MyProtocol" ]
@@ -858,7 +860,7 @@
                   },
                   #f60cd2e1: {
                     #c709e154: <#e655f08d>,
-                    #ec05e4a8: 98,
+                    #ec05e4a8: 100,
                     #c8ff724b: {
                       #c8ff724b: "setStr:",
                       #2cdb06fb: [ "setStr:", "MyProtocol" ]
@@ -868,8 +870,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 97,
-                  #f9005968: 95,
+                  #d121c0bd: 99,
+                  #f9005968: 97,
                   #21793419: ({ #c68b4ed6: 38 }, { #c68b4ed6: 38 }),
                   #eb8a1f5a: true
                 },
@@ -880,7 +882,7 @@
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 96,
+                    #ec05e4a8: 98,
                     #c8ff724b: {
                       #c8ff724b: "str",
                       #2cdb06fb: [ "str", "MyProtocol" ]
@@ -889,7 +891,7 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 99,
+                          #d121c0bd: 101,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -898,7 +900,7 @@
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 100,
+                          #d121c0bd: 102,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -910,8 +912,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 98,
-                  #f9005968: 95,
+                  #d121c0bd: 100,
+                  #f9005968: 97,
                   #21793419: ({ #c68b4ed6: 38 }, { #c68b4ed6: 38 }),
                   #eb8a1f5a: true
                 },
@@ -921,11 +923,11 @@
                 },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 96,
+                    #ec05e4a8: 98,
                     #c8ff724b: {
                       #c8ff724b: "str",
                       #2cdb06fb: [ "str", "MyProtocol" ]
@@ -934,7 +936,7 @@
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 102,
+                          #d121c0bd: 104,
                           #21793419: ({ #c68b4ed6: 38 }, { #c68b4ed6: 38 })
                         },
                         { #c8ff724b: "str", #2cdb06fb: [ "str" ] },
@@ -944,7 +946,7 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 103,
+                          #d121c0bd: 105,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -953,7 +955,7 @@
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 104,
+                          #d121c0bd: 106,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -968,7 +970,7 @@
           { })>,
       <#e1b0618e:
          ({
-            #d121c0bd: 105,
+            #d121c0bd: 107,
             #f9005968: 1,
             #21793419: ({ #c7b317f4: 14, #c68b4ed6: 1 }, { #c68b4ed6: 11 })
           },
@@ -978,7 +980,7 @@
           { })>,
       <#18d25297:
          ({
-            #d121c0bd: 106,
+            #d121c0bd: 108,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 16, #c68b4ed6: 1 },
@@ -988,8 +990,8 @@
           [
             <#c5b2960b:
                ({
-                  #d121c0bd: 107,
-                  #f9005968: 106,
+                  #d121c0bd: 109,
+                  #f9005968: 108,
                   #21793419:
                     ({ #c7b317f4: 18, #c68b4ed6: 1 }, { #c68b4ed6: 38 })
                 },
@@ -998,7 +1000,7 @@
                   #30e4876a: { #c1127ea9: 59 },
                   #3106f0d5: {
                     #c709e154: <#e655f08d>,
-                    #ec05e4a8: 108,
+                    #ec05e4a8: 110,
                     #c8ff724b: {
                       #c8ff724b: "str",
                       #2cdb06fb: [ "str", "MyClass" ]
@@ -1006,7 +1008,7 @@
                   },
                   #f60cd2e1: {
                     #c709e154: <#e655f08d>,
-                    #ec05e4a8: 109,
+                    #ec05e4a8: 111,
                     #c8ff724b: {
                       #c8ff724b: "setStr:",
                       #2cdb06fb: [ "setStr:", "MyClass" ]
@@ -1014,7 +1016,7 @@
                   },
                   #2e0d396b: {
                     #c709e154: <#38103cca>,
-                    #ec05e4a8: 110,
+                    #ec05e4a8: 112,
                     #c8ff724b: {
                       #c8ff724b: "_str",
                       #2cdb06fb: [ "_str", "MyClass" ]
@@ -1025,17 +1027,17 @@
                 })>,
             <#c5b2960b:
                ({
-                  #d121c0bd: 111,
-                  #f9005968: 106,
+                  #d121c0bd: 113,
+                  #f9005968: 108,
                   #21793419:
                     ({ #c7b317f4: 20, #c68b4ed6: 1 }, { #c68b4ed6: 36 })
                 },
                 { #c8ff724b: "x", #2cdb06fb: [ "x", "MyClass" ] },
                 {
-                  #30e4876a: { #c1127ea9: 112 },
+                  #30e4876a: { #c1127ea9: 114 },
                   #3106f0d5: {
                     #c709e154: <#e655f08d>,
-                    #ec05e4a8: 113,
+                    #ec05e4a8: 115,
                     #c8ff724b: {
                       #c8ff724b: "x",
                       #2cdb06fb: [ "x", "MyClass" ]
@@ -1043,7 +1045,7 @@
                   },
                   #f60cd2e1: {
                     #c709e154: <#e655f08d>,
-                    #ec05e4a8: 114,
+                    #ec05e4a8: 116,
                     #c8ff724b: {
                       #c8ff724b: "setX:",
                       #2cdb06fb: [ "setX:", "MyClass" ]
@@ -1051,12 +1053,12 @@
                   },
                   #2e0d396b: {
                     #c709e154: <#38103cca>,
-                    #ec05e4a8: 115,
+                    #ec05e4a8: 117,
                     #c8ff724b: {
                       #c8ff724b: "_x",
                       #2cdb06fb: [ "_x", "MyClass" ]
                     },
-                    #30e4876a: { #c1127ea9: 112 }
+                    #30e4876a: { #c1127ea9: 114 }
                   },
                   #e42793c1: [
                     <#009aba4f>, <#2fe629a9>, <#cd718b98>, <#374fb956>
@@ -1064,8 +1066,8 @@
                 })>,
             <#c5b2960b:
                ({
-                  #d121c0bd: 116,
-                  #f9005968: 106,
+                  #d121c0bd: 118,
+                  #f9005968: 108,
                   #21793419:
                     ({ #c7b317f4: 21, #c68b4ed6: 1 }, { #c68b4ed6: 34 })
                 },
@@ -1074,7 +1076,7 @@
                   #30e4876a: { #c1127ea9: 53 },
                   #3106f0d5: {
                     #c709e154: <#e655f08d>,
-                    #ec05e4a8: 117,
+                    #ec05e4a8: 119,
                     #c8ff724b: {
                       #c8ff724b: "y",
                       #2cdb06fb: [ "y", "MyClass" ]
@@ -1082,7 +1084,7 @@
                   },
                   #f60cd2e1: {
                     #c709e154: <#e655f08d>,
-                    #ec05e4a8: 118,
+                    #ec05e4a8: 120,
                     #c8ff724b: {
                       #c8ff724b: "setY:",
                       #2cdb06fb: [ "setY:", "MyClass" ]
@@ -1090,7 +1092,7 @@
                   },
                   #2e0d396b: {
                     #c709e154: <#38103cca>,
-                    #ec05e4a8: 119,
+                    #ec05e4a8: 121,
                     #c8ff724b: {
                       #c8ff724b: "_y",
                       #2cdb06fb: [ "_y", "MyClass" ]
@@ -1103,8 +1105,8 @@
                 })>,
             <#c5b2960b:
                ({
-                  #d121c0bd: 120,
-                  #f9005968: 106,
+                  #d121c0bd: 122,
+                  #f9005968: 108,
                   #21793419:
                     ({ #c7b317f4: 22, #c68b4ed6: 1 }, { #c68b4ed6: 54 })
                 },
@@ -1113,10 +1115,10 @@
                   #2cdb06fb: [ "delegate", "MyClass" ]
                 },
                 {
-                  #30e4876a: { #c1127ea9: 121 },
+                  #30e4876a: { #c1127ea9: 123 },
                   #3106f0d5: {
                     #c709e154: <#e655f08d>,
-                    #ec05e4a8: 122,
+                    #ec05e4a8: 124,
                     #c8ff724b: {
                       #c8ff724b: "delegate",
                       #2cdb06fb: [ "delegate", "MyClass" ]
@@ -1124,7 +1126,7 @@
                   },
                   #f60cd2e1: {
                     #c709e154: <#e655f08d>,
-                    #ec05e4a8: 123,
+                    #ec05e4a8: 125,
                     #c8ff724b: {
                       #c8ff724b: "setDelegate:",
                       #2cdb06fb: [ "setDelegate:", "MyClass" ]
@@ -1132,12 +1134,12 @@
                   },
                   #2e0d396b: {
                     #c709e154: <#38103cca>,
-                    #ec05e4a8: 124,
+                    #ec05e4a8: 126,
                     #c8ff724b: {
                       #c8ff724b: "_delegate",
                       #2cdb06fb: [ "_delegate", "MyClass" ]
                     },
-                    #30e4876a: { #c1127ea9: 121 }
+                    #30e4876a: { #c1127ea9: 123 }
                   },
                   #e42793c1: [
                     <#009aba4f>, <#2fe629a9>, <#cd718b98>, <#374fb956>
@@ -1145,8 +1147,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 108,
-                  #f9005968: 106,
+                  #d121c0bd: 110,
+                  #f9005968: 108,
                   #21793419:
                     ({ #c7b317f4: 18, #c68b4ed6: 38 }, { #c68b4ed6: 38 }),
                   #eb8a1f5a: true
@@ -1158,7 +1160,7 @@
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 107,
+                    #ec05e4a8: 109,
                     #c8ff724b: {
                       #c8ff724b: "str",
                       #2cdb06fb: [ "str", "MyClass" ]
@@ -1167,16 +1169,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 125,
+                          #d121c0bd: 127,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 127,
+                          #d121c0bd: 129,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -1189,19 +1191,19 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 109,
-                  #f9005968: 106,
+                  #d121c0bd: 111,
+                  #f9005968: 108,
                   #21793419: ({ #c68b4ed6: 38 }, { #c68b4ed6: 38 }),
                   #eb8a1f5a: true
                 },
                 { #c8ff724b: "setStr:", #2cdb06fb: [ "setStr:", "MyClass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 107,
+                    #ec05e4a8: 109,
                     #c8ff724b: {
                       #c8ff724b: "str",
                       #2cdb06fb: [ "str", "MyClass" ]
@@ -1210,7 +1212,7 @@
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 128,
+                          #d121c0bd: 130,
                           #21793419: ({ #c68b4ed6: 38 }, { #c68b4ed6: 38 })
                         },
                         { #c8ff724b: "str", #2cdb06fb: [ "str" ] },
@@ -1220,16 +1222,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 129,
+                          #d121c0bd: 131,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 130,
+                          #d121c0bd: 132,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -1242,8 +1244,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 113,
-                  #f9005968: 106,
+                  #d121c0bd: 115,
+                  #f9005968: 108,
                   #21793419:
                     ({ #c7b317f4: 20, #c68b4ed6: 36 }, { #c68b4ed6: 36 }),
                   #eb8a1f5a: true
@@ -1251,11 +1253,11 @@
                 { #c8ff724b: "x", #2cdb06fb: [ "x", "MyClass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 112 },
+                  #137b649c: { #c1127ea9: 114 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 111,
+                    #ec05e4a8: 113,
                     #c8ff724b: {
                       #c8ff724b: "x",
                       #2cdb06fb: [ "x", "MyClass" ]
@@ -1264,16 +1266,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 131,
+                          #d121c0bd: 133,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 132,
+                          #d121c0bd: 134,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -1285,19 +1287,19 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 114,
-                  #f9005968: 106,
+                  #d121c0bd: 116,
+                  #f9005968: 108,
                   #21793419: ({ #c68b4ed6: 36 }, { #c68b4ed6: 36 }),
                   #eb8a1f5a: true
                 },
                 { #c8ff724b: "setX:", #2cdb06fb: [ "setX:", "MyClass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 111,
+                    #ec05e4a8: 113,
                     #c8ff724b: {
                       #c8ff724b: "x",
                       #2cdb06fb: [ "x", "MyClass" ]
@@ -1306,26 +1308,26 @@
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 133,
+                          #d121c0bd: 135,
                           #21793419: ({ #c68b4ed6: 36 }, { #c68b4ed6: 36 })
                         },
                         { #c8ff724b: "x", #2cdb06fb: [ "x" ] },
-                        { #c1127ea9: 112 },
+                        { #c1127ea9: 114 },
                         { #0370b1b2: 0 })>
                   ],
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 134,
+                          #d121c0bd: 136,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 135,
+                          #d121c0bd: 137,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -1337,8 +1339,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 117,
-                  #f9005968: 106,
+                  #d121c0bd: 119,
+                  #f9005968: 108,
                   #21793419:
                     ({ #c7b317f4: 21, #c68b4ed6: 34 }, { #c68b4ed6: 34 }),
                   #eb8a1f5a: true
@@ -1350,7 +1352,7 @@
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 116,
+                    #ec05e4a8: 118,
                     #c8ff724b: {
                       #c8ff724b: "y",
                       #2cdb06fb: [ "y", "MyClass" ]
@@ -1359,16 +1361,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 136,
+                          #d121c0bd: 138,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 137,
+                          #d121c0bd: 139,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -1380,19 +1382,19 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 118,
-                  #f9005968: 106,
+                  #d121c0bd: 120,
+                  #f9005968: 108,
                   #21793419: ({ #c68b4ed6: 34 }, { #c68b4ed6: 34 }),
                   #eb8a1f5a: true
                 },
                 { #c8ff724b: "setY:", #2cdb06fb: [ "setY:", "MyClass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 116,
+                    #ec05e4a8: 118,
                     #c8ff724b: {
                       #c8ff724b: "y",
                       #2cdb06fb: [ "y", "MyClass" ]
@@ -1401,7 +1403,7 @@
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 138,
+                          #d121c0bd: 140,
                           #21793419: ({ #c68b4ed6: 34 }, { #c68b4ed6: 34 })
                         },
                         { #c8ff724b: "y", #2cdb06fb: [ "y" ] },
@@ -1411,16 +1413,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 139,
+                          #d121c0bd: 141,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 140,
+                          #d121c0bd: 142,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -1432,8 +1434,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 122,
-                  #f9005968: 106,
+                  #d121c0bd: 124,
+                  #f9005968: 108,
                   #21793419:
                     ({ #c7b317f4: 22, #c68b4ed6: 54 }, { #c68b4ed6: 54 }),
                   #eb8a1f5a: true
@@ -1444,11 +1446,11 @@
                 },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 121 },
+                  #137b649c: { #c1127ea9: 123 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 120,
+                    #ec05e4a8: 122,
                     #c8ff724b: {
                       #c8ff724b: "delegate",
                       #2cdb06fb: [ "delegate", "MyClass" ]
@@ -1457,16 +1459,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 141,
+                          #d121c0bd: 143,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 142,
+                          #d121c0bd: 144,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -1478,8 +1480,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 123,
-                  #f9005968: 106,
+                  #d121c0bd: 125,
+                  #f9005968: 108,
                   #21793419: ({ #c68b4ed6: 54 }, { #c68b4ed6: 54 }),
                   #eb8a1f5a: true
                 },
@@ -1489,11 +1491,11 @@
                 },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 120,
+                    #ec05e4a8: 122,
                     #c8ff724b: {
                       #c8ff724b: "delegate",
                       #2cdb06fb: [ "delegate", "MyClass" ]
@@ -1502,26 +1504,26 @@
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 143,
+                          #d121c0bd: 145,
                           #21793419: ({ #c68b4ed6: 54 }, { #c68b4ed6: 54 })
                         },
                         { #c8ff724b: "delegate", #2cdb06fb: [ "delegate" ] },
-                        { #c1127ea9: 121 },
+                        { #c1127ea9: 123 },
                         { #0370b1b2: 0 })>
                   ],
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 144,
+                          #d121c0bd: 146,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 145,
+                          #d121c0bd: 147,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -1541,13 +1543,13 @@
             },
             #d32dd232: {
               #c709e154: <#c37c57de>,
-              #ec05e4a8: 146,
+              #ec05e4a8: 148,
               #c8ff724b: { #c8ff724b: "MyClass", #2cdb06fb: [ "MyClass" ] }
             },
             #d688371b: [
               {
                 #c709e154: <#cd511304>,
-                #ec05e4a8: 95,
+                #ec05e4a8: 97,
                 #c8ff724b: {
                   #c8ff724b: "MyProtocol",
                   #2cdb06fb: [ "MyProtocol" ]
@@ -1557,7 +1559,7 @@
             #2eabd458: [
               {
                 #c709e154: <#fa59e7aa>,
-                #ec05e4a8: 147,
+                #ec05e4a8: 149,
                 #c8ff724b: {
                   #c8ff724b: "MyCategory",
                   #2cdb06fb: [ "MyCategory" ]
@@ -1565,14 +1567,14 @@
               },
               {
                 #c709e154: <#fa59e7aa>,
-                #ec05e4a8: 148,
+                #ec05e4a8: 150,
                 #c8ff724b: { #c8ff724b: "", #2cdb06fb: [ "" ] }
               }
             ]
           })>,
       <#3a378134:
          ({
-            #d121c0bd: 148,
+            #d121c0bd: 150,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 26, #c68b4ed6: 1 },
@@ -1582,38 +1584,38 @@
           [
             <#3ccd3797:
                ({
-                  #d121c0bd: 149,
-                  #f9005968: 148,
+                  #d121c0bd: 151,
+                  #f9005968: 150,
                   #21793419:
                     ({ #c7b317f4: 28, #c68b4ed6: 1 }, { #c68b4ed6: 35 })
                 },
                 { #c8ff724b: "foo:", #2cdb06fb: [ "foo:", "" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 150,
+                          #d121c0bd: 152,
                           #21793419: ({ #c68b4ed6: 14 }, { #c68b4ed6: 34 })
                         },
                         { #c8ff724b: "s", #2cdb06fb: [ "s" ] },
-                        { #c1127ea9: 151 },
+                        { #c1127ea9: 153 },
                         { #0370b1b2: 0 })>
                   ],
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 152,
+                          #d121c0bd: 154,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 153,
+                          #d121c0bd: 155,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -1628,13 +1630,13 @@
           {
             #2ec29bb2: {
               #c709e154: <#3cf18b8d>,
-              #ec05e4a8: 106,
+              #ec05e4a8: 108,
               #c8ff724b: { #c8ff724b: "MyClass", #2cdb06fb: [ "MyClass" ] }
             }
           })>,
       <#0e281b68:
          ({
-            #d121c0bd: 146,
+            #d121c0bd: 148,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 32, #c68b4ed6: 1 },
@@ -1644,8 +1646,8 @@
           [
             <#3ccd3797:
                ({
-                  #d121c0bd: 154,
-                  #f9005968: 146,
+                  #d121c0bd: 156,
+                  #f9005968: 148,
                   #21793419:
                     ({ #c7b317f4: 34, #c68b4ed6: 1 },
                      { #c7b317f4: 63, #c68b4ed6: 1 })
@@ -1653,34 +1655,34 @@
                 { #c8ff724b: "foo:", #2cdb06fb: [ "foo:", "MyClass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 155,
+                          #d121c0bd: 157,
                           #21793419:
                             ({ #c7b317f4: 34, #c68b4ed6: 14 },
                              { #c68b4ed6: 34 })
                         },
                         { #c8ff724b: "s", #2cdb06fb: [ "s" ] },
-                        { #c1127ea9: 151 },
+                        { #c1127ea9: 153 },
                         { #0370b1b2: 0 })>
                   ],
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 156,
+                          #d121c0bd: 158,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true,
                           #0a16e1f2: true,
                           #d3368c8a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 157,
+                          #d121c0bd: 159,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -1691,7 +1693,7 @@
                   #c11b7aa2:
                     <#d394bb73:
                        ({
-                          #d121c0bd: 158,
+                          #d121c0bd: 160,
                           #21793419:
                             ({ #c68b4ed6: 36 },
                              { #c7b317f4: 63, #c68b4ed6: 1 })
@@ -1699,7 +1701,7 @@
                         [
                           <#c59ea513:
                              ({
-                                #d121c0bd: 159,
+                                #d121c0bd: 161,
                                 #21793419:
                                   ({ #c7b317f4: 36, #c68b4ed6: 3 },
                                    { #c68b4ed6: 33 })
@@ -1707,44 +1709,44 @@
                               [
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 160,
+                                      #d121c0bd: 162,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 3 })
                                     },
                                     [
                                       <#e9db58be:
                                          ({
-                                            #d121c0bd: 161,
+                                            #d121c0bd: 163,
                                             #21793419:
                                               ({ #c68b4ed6: 3 },
                                                { #c68b4ed6: 3 })
                                           },
                                           [],
-                                          { #30e4876a: { #c1127ea9: 90 } },
+                                          { #30e4876a: { #c1127ea9: 91 } },
                                           {
                                             #c369ebbe: {
                                               #c709e154: <#ee046738>,
-                                              #ec05e4a8: 92,
+                                              #ec05e4a8: 93,
                                               #c8ff724b: {
                                                 #c8ff724b: "NSLog",
                                                 #2cdb06fb: [ "NSLog" ]
                                               },
-                                              #30e4876a: { #c1127ea9: 90 }
+                                              #30e4876a: { #c1127ea9: 91 }
                                             }
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 162 } },
+                                    { #30e4876a: { #c1127ea9: 164 } },
                                     { #c91e0a14: <#210490b0>, #fa1a3bd3: [] })>,
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 163,
+                                      #d121c0bd: 165,
                                       #21793419:
                                         ({ #c68b4ed6: 9 }, { #c68b4ed6: 10 })
                                     },
                                     [
                                       <#ff6ba872:
                                          ({
-                                            #d121c0bd: 164,
+                                            #d121c0bd: 166,
                                             #21793419:
                                               ({ #c68b4ed6: 9 },
                                                { #c68b4ed6: 10 })
@@ -1752,7 +1754,7 @@
                                           [
                                             <#3231247e:
                                                ({
-                                                  #d121c0bd: 165,
+                                                  #d121c0bd: 167,
                                                   #21793419:
                                                     ({ #c68b4ed6: 10 },
                                                      { #c68b4ed6: 10 })
@@ -1760,7 +1762,7 @@
                                                 [],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 166
+                                                    #c1127ea9: 168
                                                   },
                                                   #0e89e422: <#28055b85>
                                                 },
@@ -1772,35 +1774,35 @@
                                     { #c91e0a14: <#2b10160c>, #fa1a3bd3: [] })>,
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 167,
+                                      #d121c0bd: 169,
                                       #21793419:
                                         ({ #c68b4ed6: 18 }, { #c68b4ed6: 32 })
                                     },
                                     [
                                       <#29e41e17:
                                          ({
-                                            #d121c0bd: 168,
+                                            #d121c0bd: 170,
                                             #21793419:
                                               ({ #c68b4ed6: 18 },
                                                { #c68b4ed6: 32 })
                                           },
                                           [],
                                           {
-                                            #30e4876a: { #c1127ea9: 166 },
+                                            #30e4876a: { #c1127ea9: 168 },
                                             #0e89e422: <#28055b85>
                                           },
                                           {
-                                            #30e4876a: { #c1127ea9: 169 },
+                                            #30e4876a: { #c1127ea9: 171 },
                                             #0056d5e8: "int **"
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 170 } },
+                                    { #30e4876a: { #c1127ea9: 172 } },
                                     { #c91e0a14: <#0d4316b1>, #fa1a3bd3: [] })>
                               ],
-                              { #30e4876a: { #c1127ea9: 101 } })>,
+                              { #30e4876a: { #c1127ea9: 103 } })>,
                           <#c59ea513:
                              ({
-                                #d121c0bd: 171,
+                                #d121c0bd: 173,
                                 #21793419:
                                   ({ #c7b317f4: 38, #c68b4ed6: 3 },
                                    { #c68b4ed6: 59 })
@@ -1808,44 +1810,44 @@
                               [
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 172,
+                                      #d121c0bd: 174,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 3 })
                                     },
                                     [
                                       <#e9db58be:
                                          ({
-                                            #d121c0bd: 173,
+                                            #d121c0bd: 175,
                                             #21793419:
                                               ({ #c68b4ed6: 3 },
                                                { #c68b4ed6: 3 })
                                           },
                                           [],
-                                          { #30e4876a: { #c1127ea9: 90 } },
+                                          { #30e4876a: { #c1127ea9: 91 } },
                                           {
                                             #c369ebbe: {
                                               #c709e154: <#ee046738>,
-                                              #ec05e4a8: 92,
+                                              #ec05e4a8: 93,
                                               #c8ff724b: {
                                                 #c8ff724b: "NSLog",
                                                 #2cdb06fb: [ "NSLog" ]
                                               },
-                                              #30e4876a: { #c1127ea9: 90 }
+                                              #30e4876a: { #c1127ea9: 91 }
                                             }
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 162 } },
+                                    { #30e4876a: { #c1127ea9: 164 } },
                                     { #c91e0a14: <#210490b0>, #fa1a3bd3: [] })>,
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 174,
+                                      #d121c0bd: 176,
                                       #21793419:
                                         ({ #c68b4ed6: 9 }, { #c68b4ed6: 10 })
                                     },
                                     [
                                       <#ff6ba872:
                                          ({
-                                            #d121c0bd: 175,
+                                            #d121c0bd: 177,
                                             #21793419:
                                               ({ #c68b4ed6: 9 },
                                                { #c68b4ed6: 10 })
@@ -1853,7 +1855,7 @@
                                           [
                                             <#3231247e:
                                                ({
-                                                  #d121c0bd: 176,
+                                                  #d121c0bd: 178,
                                                   #21793419:
                                                     ({ #c68b4ed6: 10 },
                                                      { #c68b4ed6: 10 })
@@ -1861,7 +1863,7 @@
                                                 [],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 166
+                                                    #c1127ea9: 168
                                                   },
                                                   #0e89e422: <#28055b85>
                                                 },
@@ -1873,14 +1875,14 @@
                                     { #c91e0a14: <#2b10160c>, #fa1a3bd3: [] })>,
                                 <#f104c570:
                                    ({
-                                      #d121c0bd: 177,
+                                      #d121c0bd: 179,
                                       #21793419:
                                         ({ #c68b4ed6: 18 }, { #c68b4ed6: 58 })
                                     },
                                     [
                                       <#c3b129f9:
                                          ({
-                                            #d121c0bd: 178,
+                                            #d121c0bd: 180,
                                             #21793419:
                                               ({ #c68b4ed6: 19 },
                                                { #c68b4ed6: 19 })
@@ -1888,7 +1890,7 @@
                                           [
                                             <#e9db58be:
                                                ({
-                                                  #d121c0bd: 179,
+                                                  #d121c0bd: 181,
                                                   #21793419:
                                                     ({ #c68b4ed6: 19 },
                                                      { #c68b4ed6: 19 })
@@ -1896,7 +1898,7 @@
                                                 [],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 126,
+                                                    #c1127ea9: 128,
                                                     #ea1a680e: true
                                                   },
                                                   #0e89e422: <#28055b85>
@@ -1904,26 +1906,26 @@
                                                 {
                                                   #c369ebbe: {
                                                     #c709e154: <#c6dba908>,
-                                                    #ec05e4a8: 156,
+                                                    #ec05e4a8: 158,
                                                     #c8ff724b: {
                                                       #c8ff724b: "self",
                                                       #2cdb06fb: [ "self" ]
                                                     },
                                                     #30e4876a: {
-                                                      #c1127ea9: 126,
+                                                      #c1127ea9: 128,
                                                       #ea1a680e: true
                                                     }
                                                   }
                                                 })>
                                           ],
-                                          { #30e4876a: { #c1127ea9: 126 } },
+                                          { #30e4876a: { #c1127ea9: 128 } },
                                           {
                                             #c91e0a14: <#f7495e1f>,
                                             #fa1a3bd3: []
                                           })>,
                                       <#084d5aa0:
                                          ({
-                                            #d121c0bd: 180,
+                                            #d121c0bd: 182,
                                             #21793419:
                                               ({ #c68b4ed6: 43 },
                                                { #c68b4ed6: 57 })
@@ -1938,10 +1940,10 @@
                                       #ec05e4a8: 41
                                     })>
                               ],
-                              { #30e4876a: { #c1127ea9: 101 } })>,
+                              { #30e4876a: { #c1127ea9: 103 } })>,
                           <#c59ea513:
                              ({
-                                #d121c0bd: 181,
+                                #d121c0bd: 183,
                                 #21793419:
                                   ({ #c7b317f4: 40, #c68b4ed6: 3 },
                                    { #c68b4ed6: 73 })
@@ -1949,44 +1951,44 @@
                               [
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 182,
+                                      #d121c0bd: 184,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 3 })
                                     },
                                     [
                                       <#e9db58be:
                                          ({
-                                            #d121c0bd: 183,
+                                            #d121c0bd: 185,
                                             #21793419:
                                               ({ #c68b4ed6: 3 },
                                                { #c68b4ed6: 3 })
                                           },
                                           [],
-                                          { #30e4876a: { #c1127ea9: 90 } },
+                                          { #30e4876a: { #c1127ea9: 91 } },
                                           {
                                             #c369ebbe: {
                                               #c709e154: <#ee046738>,
-                                              #ec05e4a8: 92,
+                                              #ec05e4a8: 93,
                                               #c8ff724b: {
                                                 #c8ff724b: "NSLog",
                                                 #2cdb06fb: [ "NSLog" ]
                                               },
-                                              #30e4876a: { #c1127ea9: 90 }
+                                              #30e4876a: { #c1127ea9: 91 }
                                             }
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 162 } },
+                                    { #30e4876a: { #c1127ea9: 164 } },
                                     { #c91e0a14: <#210490b0>, #fa1a3bd3: [] })>,
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 184,
+                                      #d121c0bd: 186,
                                       #21793419:
                                         ({ #c68b4ed6: 9 }, { #c68b4ed6: 10 })
                                     },
                                     [
                                       <#ff6ba872:
                                          ({
-                                            #d121c0bd: 185,
+                                            #d121c0bd: 187,
                                             #21793419:
                                               ({ #c68b4ed6: 9 },
                                                { #c68b4ed6: 10 })
@@ -1994,7 +1996,7 @@
                                           [
                                             <#3231247e:
                                                ({
-                                                  #d121c0bd: 186,
+                                                  #d121c0bd: 188,
                                                   #21793419:
                                                     ({ #c68b4ed6: 10 },
                                                      { #c68b4ed6: 10 })
@@ -2002,7 +2004,7 @@
                                                 [],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 166
+                                                    #c1127ea9: 168
                                                   },
                                                   #0e89e422: <#28055b85>
                                                 },
@@ -2014,14 +2016,14 @@
                                     { #c91e0a14: <#2b10160c>, #fa1a3bd3: [] })>,
                                 <#f104c570:
                                    ({
-                                      #d121c0bd: 187,
+                                      #d121c0bd: 189,
                                       #21793419:
                                         ({ #c68b4ed6: 18 }, { #c68b4ed6: 72 })
                                     },
                                     [
                                       <#f104c570:
                                          ({
-                                            #d121c0bd: 188,
+                                            #d121c0bd: 190,
                                             #21793419:
                                               ({ #c68b4ed6: 19 },
                                                { #c68b4ed6: 30 })
@@ -2029,7 +2031,7 @@
                                           [
                                             <#c3b129f9:
                                                ({
-                                                  #d121c0bd: 189,
+                                                  #d121c0bd: 191,
                                                   #21793419:
                                                     ({ #c68b4ed6: 20 },
                                                      { #c68b4ed6: 20 })
@@ -2037,7 +2039,7 @@
                                                 [
                                                   <#e9db58be:
                                                      ({
-                                                        #d121c0bd: 190,
+                                                        #d121c0bd: 192,
                                                         #21793419:
                                                           ({ #c68b4ed6: 20 },
                                                            { #c68b4ed6: 20 })
@@ -2045,7 +2047,7 @@
                                                       [],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 126,
+                                                          #c1127ea9: 128,
                                                           #ea1a680e: true
                                                         },
                                                         #0e89e422:
@@ -2055,7 +2057,7 @@
                                                         #c369ebbe: {
                                                           #c709e154:
                                                             <#c6dba908>,
-                                                          #ec05e4a8: 156,
+                                                          #ec05e4a8: 158,
                                                           #c8ff724b: {
                                                             #c8ff724b: "self",
                                                             #2cdb06fb: [
@@ -2063,7 +2065,7 @@
                                                             ]
                                                           },
                                                           #30e4876a: {
-                                                            #c1127ea9: 126,
+                                                            #c1127ea9: 128,
                                                             #ea1a680e: true
                                                           }
                                                         }
@@ -2071,7 +2073,7 @@
                                                 ],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 126
+                                                    #c1127ea9: 128
                                                   }
                                                 },
                                                 {
@@ -2086,7 +2088,7 @@
                                           })>,
                                       <#e2680e59:
                                          ({
-                                            #d121c0bd: 191,
+                                            #d121c0bd: 193,
                                             #21793419:
                                               ({ #c68b4ed6: 51 },
                                                { #c68b4ed6: 71 })
@@ -2095,7 +2097,7 @@
                                           { #30e4876a: { #c1127ea9: 47 } },
                                           {
                                             #c709e154: <#cd511304>,
-                                            #ec05e4a8: 95,
+                                            #ec05e4a8: 97,
                                             #c8ff724b: {
                                               #c8ff724b: "MyProtocol",
                                               #2cdb06fb: [ "MyProtocol" ]
@@ -2108,10 +2110,10 @@
                                       #ec05e4a8: 45
                                     })>
                               ],
-                              { #30e4876a: { #c1127ea9: 101 } })>,
+                              { #30e4876a: { #c1127ea9: 103 } })>,
                           <#152ea3f2:
                              ({
-                                #d121c0bd: 192,
+                                #d121c0bd: 194,
                                 #21793419:
                                   ({ #c7b317f4: 42, #c68b4ed6: 3 },
                                    { #c7b317f4: 45, #c68b4ed6: 4 })
@@ -2119,7 +2121,7 @@
                               [
                                 <#d0cddcea:
                                    ({
-                                      #d121c0bd: 193,
+                                      #d121c0bd: 195,
                                       #21793419:
                                         ({ #c7b317f4: 42, #c68b4ed6: 38 },
                                          { #c7b317f4: 45, #c68b4ed6: 3 })
@@ -2127,7 +2129,7 @@
                                     [
                                       <#ea7fa902:
                                          ({
-                                            #d121c0bd: 194,
+                                            #d121c0bd: 196,
                                             #21793419:
                                               ({
                                                  #c7b317f4: 42,
@@ -2139,11 +2141,11 @@
                                                })
                                           },
                                           [],
-                                          { #30e4876a: { #c1127ea9: 195 } },
+                                          { #30e4876a: { #c1127ea9: 197 } },
                                           <#e9c7fc37:
                                              ({
-                                                #d121c0bd: 196,
-                                                #f9005968: 154,
+                                                #d121c0bd: 198,
+                                                #f9005968: 156,
                                                 #21793419:
                                                   ({
                                                      #c7b317f4: 42,
@@ -2158,7 +2160,7 @@
                                                 #d17ebeaa: [
                                                   <#fd75cc45:
                                                      ({
-                                                        #d121c0bd: 197,
+                                                        #d121c0bd: 199,
                                                         #21793419:
                                                           ({
                                                              #c7b317f4: 42,
@@ -2179,13 +2181,13 @@
                                                   {
                                                     #e90d123c: {
                                                       #c709e154: <#c6dba908>,
-                                                      #ec05e4a8: 156,
+                                                      #ec05e4a8: 158,
                                                       #c8ff724b: {
                                                         #c8ff724b: "self",
                                                         #2cdb06fb: [ "self" ]
                                                       },
                                                       #30e4876a: {
-                                                        #c1127ea9: 126,
+                                                        #c1127ea9: 128,
                                                         #ea1a680e: true
                                                       }
                                                     }
@@ -2194,7 +2196,7 @@
                                                 #c11b7aa2:
                                                   <#d394bb73:
                                                      ({
-                                                        #d121c0bd: 198,
+                                                        #d121c0bd: 200,
                                                         #21793419:
                                                           ({ #c68b4ed6: 53 },
                                                            {
@@ -2205,7 +2207,7 @@
                                                       [
                                                         <#26afa8d2:
                                                            ({
-                                                              #d121c0bd: 199,
+                                                              #d121c0bd: 201,
                                                               #21793419:
                                                                 ({
                                                                    #c7b317f4:
@@ -2222,7 +2224,7 @@
                                                               <#d49390e5:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    200,
+                                                                    202,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2240,7 +2242,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    201,
+                                                                    203,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2256,7 +2258,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    202,
+                                                                    204,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2272,7 +2274,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -2282,7 +2284,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    203,
+                                                                    205,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2298,7 +2300,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    204,
+                                                                    206,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2314,7 +2316,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     },
@@ -2326,7 +2328,7 @@
                                                                     #c709e154:
                                                                     <#c6dba908>,
                                                                     #ec05e4a8:
-                                                                    156,
+                                                                    158,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "self",
@@ -2336,7 +2338,7 @@
                                                                     },
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     }
@@ -2346,7 +2348,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -2360,7 +2362,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    205
+                                                                    207
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>,
@@ -2374,7 +2376,7 @@
                                                                     #c709e154:
                                                                     <#f9260501>,
                                                                     #ec05e4a8:
-                                                                    107,
+                                                                    109,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "str",
@@ -2392,7 +2394,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    206,
+                                                                    208,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2420,7 +2422,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    207,
+                                                                    209,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2446,7 +2448,7 @@
                                                                     #c709e154:
                                                                     <#334f163b>,
                                                                     #ec05e4a8:
-                                                                    197,
+                                                                    199,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "x",
@@ -2477,7 +2479,7 @@
                                                               <#0d679c05:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    202,
+                                                                    204,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2493,7 +2495,7 @@
                                                                   {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                   },
                                                                   {
@@ -2503,7 +2505,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    203,
+                                                                    205,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2519,7 +2521,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    204,
+                                                                    206,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2535,7 +2537,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     },
@@ -2547,7 +2549,7 @@
                                                                     #c709e154:
                                                                     <#c6dba908>,
                                                                     #ec05e4a8:
-                                                                    156,
+                                                                    158,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "self",
@@ -2557,7 +2559,7 @@
                                                                     },
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     }
@@ -2567,7 +2569,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -2580,7 +2582,7 @@
                                                               <#0d679c05:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    206,
+                                                                    208,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2608,7 +2610,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    207,
+                                                                    209,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2634,7 +2636,7 @@
                                                                     #c709e154:
                                                                     <#334f163b>,
                                                                     #ec05e4a8:
-                                                                    197,
+                                                                    199,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "x",
@@ -2652,7 +2654,7 @@
                                                               <#0d679c05:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    208,
+                                                                    210,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2678,7 +2680,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    209,
+                                                                    211,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2694,7 +2696,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    206,
+                                                                    208,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2722,7 +2724,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    207,
+                                                                    209,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2748,7 +2750,7 @@
                                                                     #c709e154:
                                                                     <#334f163b>,
                                                                     #ec05e4a8:
-                                                                    197,
+                                                                    199,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "x",
@@ -2780,7 +2782,7 @@
                                                               <#f104c570:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    210,
+                                                                    212,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2798,7 +2800,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    202,
+                                                                    204,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2814,7 +2816,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -2824,7 +2826,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    203,
+                                                                    205,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2840,7 +2842,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    204,
+                                                                    206,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2856,7 +2858,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     },
@@ -2868,7 +2870,7 @@
                                                                     #c709e154:
                                                                     <#c6dba908>,
                                                                     #ec05e4a8:
-                                                                    156,
+                                                                    158,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "self",
@@ -2878,7 +2880,7 @@
                                                                     },
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     }
@@ -2888,7 +2890,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -2903,7 +2905,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    208,
+                                                                    210,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2929,7 +2931,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    209,
+                                                                    211,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2945,7 +2947,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    206,
+                                                                    208,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2973,7 +2975,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    207,
+                                                                    209,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -2999,7 +3001,7 @@
                                                                     #c709e154:
                                                                     <#334f163b>,
                                                                     #ec05e4a8:
-                                                                    197,
+                                                                    199,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "x",
@@ -3032,7 +3034,7 @@
                                                                   {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    101
+                                                                    103
                                                                     }
                                                                   },
                                                                   {
@@ -3041,7 +3043,7 @@
                                                                     #1ea99a8b:
                                                                     true,
                                                                     #ec05e4a8:
-                                                                    211
+                                                                    213
                                                                   })>
                                                             ],
                                                             {
@@ -3051,7 +3053,7 @@
                                                             })>,
                                                         <#df3bdb38:
                                                            ({
-                                                              #d121c0bd: 212,
+                                                              #d121c0bd: 214,
                                                               #21793419:
                                                                 ({
                                                                    #c7b317f4:
@@ -3068,7 +3070,7 @@
                                                               <#f104c570:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    213,
+                                                                    215,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3086,7 +3088,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    214,
+                                                                    216,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3102,7 +3104,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    215,
+                                                                    217,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3128,7 +3130,7 @@
                                                                     #c709e154:
                                                                     <#334f163b>,
                                                                     #ec05e4a8:
-                                                                    197,
+                                                                    199,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "x",
@@ -3174,12 +3176,12 @@
                                                   "__15-[MyClass foo:]_block_invoke"
                                               })>)>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 195 } },
+                                    { #30e4876a: { #c1127ea9: 197 } },
                                     {
                                       #39445af5: [
                                         {
                                           #c709e154: <#c829e52d>,
-                                          #ec05e4a8: 196
+                                          #ec05e4a8: 198
                                         }
                                       ]
                                     })>
@@ -3187,7 +3189,7 @@
                               [
                                 <#11c182d1:
                                    ({
-                                      #d121c0bd: 216,
+                                      #d121c0bd: 218,
                                       #21793419:
                                         ({ #c7b317f4: 42, #c68b4ed6: 3 },
                                          { #c7b317f4: 45, #c68b4ed6: 3 })
@@ -3196,12 +3198,12 @@
                                       #c8ff724b: "block",
                                       #2cdb06fb: [ "block" ]
                                     },
-                                    { #c1127ea9: 217 },
+                                    { #c1127ea9: 219 },
                                     {
                                       #fe93c404:
                                         <#d0cddcea:
                                            ({
-                                              #d121c0bd: 193,
+                                              #d121c0bd: 195,
                                               #21793419:
                                                 ({
                                                    #c7b317f4: 42,
@@ -3215,7 +3217,7 @@
                                             [
                                               <#ea7fa902:
                                                  ({
-                                                    #d121c0bd: 194,
+                                                    #d121c0bd: 196,
                                                     #21793419:
                                                       ({
                                                          #c7b317f4: 42,
@@ -3229,13 +3231,13 @@
                                                   [],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 195
+                                                      #c1127ea9: 197
                                                     }
                                                   },
                                                   <#e9c7fc37:
                                                      ({
-                                                        #d121c0bd: 196,
-                                                        #f9005968: 154,
+                                                        #d121c0bd: 198,
+                                                        #f9005968: 156,
                                                         #21793419:
                                                           ({
                                                              #c7b317f4: 42,
@@ -3251,7 +3253,7 @@
                                                           <#fd75cc45:
                                                              ({
                                                                 #d121c0bd:
-                                                                  197,
+                                                                  199,
                                                                 #21793419:
                                                                   ({
                                                                     #c7b317f4:
@@ -3287,7 +3289,7 @@
                                                             #e90d123c: {
                                                               #c709e154:
                                                                 <#c6dba908>,
-                                                              #ec05e4a8: 156,
+                                                              #ec05e4a8: 158,
                                                               #c8ff724b: {
                                                                 #c8ff724b:
                                                                   "self",
@@ -3297,7 +3299,7 @@
                                                               },
                                                               #30e4876a: {
                                                                 #c1127ea9:
-                                                                  126,
+                                                                  128,
                                                                 #ea1a680e:
                                                                   true
                                                               }
@@ -3308,7 +3310,7 @@
                                                           <#d394bb73:
                                                              ({
                                                                 #d121c0bd:
-                                                                  198,
+                                                                  200,
                                                                 #21793419:
                                                                   ({
                                                                     #c68b4ed6:
@@ -3325,7 +3327,7 @@
                                                                 <#26afa8d2:
                                                                    ({
                                                                     #d121c0bd:
-                                                                    199,
+                                                                    201,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3343,7 +3345,7 @@
                                                                     <#d49390e5:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    200,
+                                                                    202,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3359,7 +3361,7 @@
                                                                     <#e9c8dd27:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    201,
+                                                                    203,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3375,7 +3377,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    202,
+                                                                    204,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3391,7 +3393,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -3401,7 +3403,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    203,
+                                                                    205,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3417,7 +3419,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    204,
+                                                                    206,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3433,7 +3435,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     },
@@ -3445,7 +3447,7 @@
                                                                     #c709e154:
                                                                     <#c6dba908>,
                                                                     #ec05e4a8:
-                                                                    156,
+                                                                    158,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "self",
@@ -3455,7 +3457,7 @@
                                                                     },
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     }
@@ -3465,7 +3467,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -3479,7 +3481,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    205
+                                                                    207
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>,
@@ -3493,7 +3495,7 @@
                                                                     #c709e154:
                                                                     <#f9260501>,
                                                                     #ec05e4a8:
-                                                                    107,
+                                                                    109,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "str",
@@ -3509,7 +3511,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    206,
+                                                                    208,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3537,7 +3539,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    207,
+                                                                    209,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3563,7 +3565,7 @@
                                                                     #c709e154:
                                                                     <#334f163b>,
                                                                     #ec05e4a8:
-                                                                    197,
+                                                                    199,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "x",
@@ -3594,7 +3596,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    202,
+                                                                    204,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3610,7 +3612,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -3620,7 +3622,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    203,
+                                                                    205,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3636,7 +3638,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    204,
+                                                                    206,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3652,7 +3654,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     },
@@ -3664,7 +3666,7 @@
                                                                     #c709e154:
                                                                     <#c6dba908>,
                                                                     #ec05e4a8:
-                                                                    156,
+                                                                    158,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "self",
@@ -3674,7 +3676,7 @@
                                                                     },
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     }
@@ -3684,7 +3686,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -3697,7 +3699,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    206,
+                                                                    208,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3725,7 +3727,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    207,
+                                                                    209,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3751,7 +3753,7 @@
                                                                     #c709e154:
                                                                     <#334f163b>,
                                                                     #ec05e4a8:
-                                                                    197,
+                                                                    199,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "x",
@@ -3769,7 +3771,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    208,
+                                                                    210,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3795,7 +3797,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    209,
+                                                                    211,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3811,7 +3813,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    206,
+                                                                    208,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3839,7 +3841,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    207,
+                                                                    209,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3865,7 +3867,7 @@
                                                                     #c709e154:
                                                                     <#334f163b>,
                                                                     #ec05e4a8:
-                                                                    197,
+                                                                    199,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "x",
@@ -3897,7 +3899,7 @@
                                                                     <#f104c570:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    210,
+                                                                    212,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3913,7 +3915,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    202,
+                                                                    204,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3929,7 +3931,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -3939,7 +3941,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    203,
+                                                                    205,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3955,7 +3957,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    204,
+                                                                    206,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -3971,7 +3973,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     },
@@ -3983,7 +3985,7 @@
                                                                     #c709e154:
                                                                     <#c6dba908>,
                                                                     #ec05e4a8:
-                                                                    156,
+                                                                    158,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "self",
@@ -3993,7 +3995,7 @@
                                                                     },
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                     }
@@ -4003,7 +4005,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                     },
                                                                     {
@@ -4016,7 +4018,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    208,
+                                                                    210,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4042,7 +4044,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    209,
+                                                                    211,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4058,7 +4060,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    206,
+                                                                    208,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4086,7 +4088,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    207,
+                                                                    209,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4112,7 +4114,7 @@
                                                                     #c709e154:
                                                                     <#334f163b>,
                                                                     #ec05e4a8:
-                                                                    197,
+                                                                    199,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "x",
@@ -4145,7 +4147,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    101
+                                                                    103
                                                                     }
                                                                     },
                                                                     {
@@ -4154,7 +4156,7 @@
                                                                     #1ea99a8b:
                                                                     true,
                                                                     #ec05e4a8:
-                                                                    211
+                                                                    213
                                                                     })>
                                                                     ],
                                                                     {
@@ -4166,7 +4168,7 @@
                                                                 <#df3bdb38:
                                                                    ({
                                                                     #d121c0bd:
-                                                                    212,
+                                                                    214,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4184,7 +4186,7 @@
                                                                     <#f104c570:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    213,
+                                                                    215,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4200,7 +4202,7 @@
                                                                     <#c3b129f9:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    214,
+                                                                    216,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4216,7 +4218,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    215,
+                                                                    217,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4242,7 +4244,7 @@
                                                                     #c709e154:
                                                                     <#334f163b>,
                                                                     #ec05e4a8:
-                                                                    197,
+                                                                    199,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "x",
@@ -4288,12 +4290,12 @@
                                                           "__15-[MyClass foo:]_block_invoke"
                                                       })>)>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 195 } },
+                                            { #30e4876a: { #c1127ea9: 197 } },
                                             {
                                               #39445af5: [
                                                 {
                                                   #c709e154: <#c829e52d>,
-                                                  #ec05e4a8: 196
+                                                  #ec05e4a8: 198
                                                 }
                                               ]
                                             })>
@@ -4301,7 +4303,7 @@
                               ])>,
                           <#f7d73e44:
                              ({
-                                #d121c0bd: 218,
+                                #d121c0bd: 220,
                                 #21793419:
                                   ({ #c7b317f4: 47, #c68b4ed6: 3 },
                                    { #c7b317f4: 57, #c68b4ed6: 3 })
@@ -4309,7 +4311,7 @@
                               [
                                 <#d394bb73:
                                    ({
-                                      #d121c0bd: 219,
+                                      #d121c0bd: 221,
                                       #21793419:
                                         ({ #c7b317f4: 47, #c68b4ed6: 8 },
                                          { #c7b317f4: 53, #c68b4ed6: 3 })
@@ -4317,7 +4319,7 @@
                                     [
                                       <#152ea3f2:
                                          ({
-                                            #d121c0bd: 220,
+                                            #d121c0bd: 222,
                                             #21793419:
                                               ({
                                                  #c7b317f4: 48,
@@ -4328,7 +4330,7 @@
                                           [
                                             <#d0cddcea:
                                                ({
-                                                  #d121c0bd: 221,
+                                                  #d121c0bd: 223,
                                                   #21793419:
                                                     ({ #c68b4ed6: 18 },
                                                      { #c68b4ed6: 26 })
@@ -4336,7 +4338,7 @@
                                                 [
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 222,
+                                                        #d121c0bd: 224,
                                                         #21793419:
                                                           ({ #c68b4ed6: 18 },
                                                            { #c68b4ed6: 26 })
@@ -4344,7 +4346,7 @@
                                                       [
                                                         <#eae2bb82:
                                                            ({
-                                                              #d121c0bd: 223,
+                                                              #d121c0bd: 225,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -4359,7 +4361,7 @@
                                                               <#c3b129f9:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    224,
+                                                                    226,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4377,7 +4379,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    225,
+                                                                    227,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4393,7 +4395,7 @@
                                                                     <#32854f53:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    226,
+                                                                    228,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4409,7 +4411,7 @@
                                                                     <#0fb8fb71:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    227,
+                                                                    229,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4440,7 +4442,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    228
+                                                                    230
                                                                     }
                                                                     },
                                                                     {
@@ -4451,7 +4453,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    228
+                                                                    230
                                                                     }
                                                                     },
                                                                     {
@@ -4502,7 +4504,7 @@
                                           [
                                             <#11c182d1:
                                                ({
-                                                  #d121c0bd: 229,
+                                                  #d121c0bd: 231,
                                                   #21793419:
                                                     ({ #c68b4ed6: 5 },
                                                      { #c68b4ed6: 26 }),
@@ -4518,7 +4520,7 @@
                                                   #fe93c404:
                                                     <#d0cddcea:
                                                        ({
-                                                          #d121c0bd: 221,
+                                                          #d121c0bd: 223,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 18
@@ -4531,7 +4533,7 @@
                                                           <#c3b129f9:
                                                              ({
                                                                 #d121c0bd:
-                                                                  222,
+                                                                  224,
                                                                 #21793419:
                                                                   ({
                                                                     #c68b4ed6:
@@ -4546,7 +4548,7 @@
                                                                 <#eae2bb82:
                                                                    ({
                                                                     #d121c0bd:
-                                                                    223,
+                                                                    225,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4562,7 +4564,7 @@
                                                                     <#c3b129f9:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    224,
+                                                                    226,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4578,7 +4580,7 @@
                                                                     <#c3b129f9:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    225,
+                                                                    227,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4594,7 +4596,7 @@
                                                                     <#32854f53:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    226,
+                                                                    228,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4610,7 +4612,7 @@
                                                                     <#0fb8fb71:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    227,
+                                                                    229,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4641,7 +4643,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    228
+                                                                    230
                                                                     }
                                                                     },
                                                                     {
@@ -4652,7 +4654,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    228
+                                                                    230
                                                                     }
                                                                     },
                                                                     {
@@ -4708,7 +4710,7 @@
                                           ])>,
                                       <#d0cddcea:
                                          ({
-                                            #d121c0bd: 230,
+                                            #d121c0bd: 232,
                                             #21793419:
                                               ({
                                                  #c7b317f4: 49,
@@ -4719,7 +4721,7 @@
                                           [
                                             <#c59ea513:
                                                ({
-                                                  #d121c0bd: 231,
+                                                  #d121c0bd: 233,
                                                   #21793419:
                                                     ({ #c68b4ed6: 5 },
                                                      { #c68b4ed6: 24 })
@@ -4727,7 +4729,7 @@
                                                 [
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 232,
+                                                        #d121c0bd: 234,
                                                         #21793419:
                                                           ({ #c68b4ed6: 5 },
                                                            { #c68b4ed6: 5 })
@@ -4735,7 +4737,7 @@
                                                       [
                                                         <#e9db58be:
                                                            ({
-                                                              #d121c0bd: 233,
+                                                              #d121c0bd: 235,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -4749,14 +4751,14 @@
                                                             [],
                                                             {
                                                               #30e4876a: {
-                                                                #c1127ea9: 90
+                                                                #c1127ea9: 91
                                                               }
                                                             },
                                                             {
                                                               #c369ebbe: {
                                                                 #c709e154:
                                                                   <#ee046738>,
-                                                                #ec05e4a8: 92,
+                                                                #ec05e4a8: 93,
                                                                 #c8ff724b: {
                                                                   #c8ff724b:
                                                                     "NSLog",
@@ -4766,14 +4768,14 @@
                                                                 },
                                                                 #30e4876a: {
                                                                   #c1127ea9:
-                                                                    90
+                                                                    91
                                                                 }
                                                               }
                                                             })>
                                                       ],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 162
+                                                          #c1127ea9: 164
                                                         }
                                                       },
                                                       {
@@ -4783,7 +4785,7 @@
                                                       })>,
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 234,
+                                                        #d121c0bd: 236,
                                                         #21793419:
                                                           ({ #c68b4ed6: 11 },
                                                            { #c68b4ed6: 12 })
@@ -4791,7 +4793,7 @@
                                                       [
                                                         <#ff6ba872:
                                                            ({
-                                                              #d121c0bd: 235,
+                                                              #d121c0bd: 237,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -4806,7 +4808,7 @@
                                                               <#3231247e:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    236,
+                                                                    238,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4822,7 +4824,7 @@
                                                                   {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    166
+                                                                    168
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>
@@ -4847,7 +4849,7 @@
                                                       })>,
                                                   <#26afa8d2:
                                                      ({
-                                                        #d121c0bd: 237,
+                                                        #d121c0bd: 239,
                                                         #21793419:
                                                           ({ #c68b4ed6: 20 },
                                                            { #c68b4ed6: 23 })
@@ -4855,7 +4857,7 @@
                                                       [
                                                         <#f28ad889:
                                                            ({
-                                                              #d121c0bd: 238,
+                                                              #d121c0bd: 240,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -4870,7 +4872,7 @@
                                                               <#0d679c05:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    239,
+                                                                    241,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4896,7 +4898,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    240,
+                                                                    242,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4912,7 +4914,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    241,
+                                                                    243,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4938,7 +4940,7 @@
                                                                     #c709e154:
                                                                     <#004196c7>,
                                                                     #ec05e4a8:
-                                                                    229,
+                                                                    231,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "a",
@@ -4969,7 +4971,7 @@
                                                               <#0d679c05:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    242,
+                                                                    244,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -4995,7 +4997,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    243,
+                                                                    245,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5027,7 +5029,7 @@
                                                             {
                                                               #30e4876a: {
                                                                 #c1127ea9:
-                                                                  205
+                                                                  207
                                                               },
                                                               #0e89e422:
                                                                 <#28055b85>,
@@ -5040,7 +5042,7 @@
                                                             })>,
                                                         <#0d679c05:
                                                            ({
-                                                              #d121c0bd: 239,
+                                                              #d121c0bd: 241,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -5062,7 +5064,7 @@
                                                                 <#c3b129f9:
                                                                    ({
                                                                     #d121c0bd:
-                                                                    240,
+                                                                    242,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5078,7 +5080,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    241,
+                                                                    243,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5104,7 +5106,7 @@
                                                                     #c709e154:
                                                                     <#004196c7>,
                                                                     #ec05e4a8:
-                                                                    229,
+                                                                    231,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "a",
@@ -5134,7 +5136,7 @@
                                                             })>,
                                                         <#0d679c05:
                                                            ({
-                                                              #d121c0bd: 242,
+                                                              #d121c0bd: 244,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -5156,7 +5158,7 @@
                                                                 <#0fb8fb71:
                                                                    ({
                                                                     #d121c0bd:
-                                                                    243,
+                                                                    245,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5186,7 +5188,7 @@
                                                             })>,
                                                         <#c3b129f9:
                                                            ({
-                                                              #d121c0bd: 244,
+                                                              #d121c0bd: 246,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -5201,7 +5203,7 @@
                                                               <#f104c570:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    245,
+                                                                    247,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5219,7 +5221,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    239,
+                                                                    241,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5245,7 +5247,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    240,
+                                                                    242,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5261,7 +5263,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    241,
+                                                                    243,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5287,7 +5289,7 @@
                                                                     #c709e154:
                                                                     <#004196c7>,
                                                                     #ec05e4a8:
-                                                                    229,
+                                                                    231,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "a",
@@ -5320,7 +5322,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    246,
+                                                                    248,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5336,7 +5338,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    242,
+                                                                    244,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5362,7 +5364,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    243,
+                                                                    245,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5436,15 +5438,15 @@
                                                 ],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 101
+                                                    #c1127ea9: 103
                                                   }
                                                 })>
                                           ],
-                                          { #30e4876a: { #c1127ea9: 101 } },
+                                          { #30e4876a: { #c1127ea9: 103 } },
                                           { })>,
                                       <#152ea3f2:
                                          ({
-                                            #d121c0bd: 247,
+                                            #d121c0bd: 249,
                                             #21793419:
                                               ({
                                                  #c7b317f4: 51,
@@ -5455,7 +5457,7 @@
                                           [
                                             <#d0cddcea:
                                                ({
-                                                  #d121c0bd: 248,
+                                                  #d121c0bd: 250,
                                                   #21793419:
                                                     ({ #c68b4ed6: 23 },
                                                      { #c68b4ed6: 36 })
@@ -5463,7 +5465,7 @@
                                                 [
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 249,
+                                                        #d121c0bd: 251,
                                                         #21793419:
                                                           ({ #c68b4ed6: 23 },
                                                            { #c68b4ed6: 36 })
@@ -5471,7 +5473,7 @@
                                                       [
                                                         <#f0ddca4d:
                                                            ({
-                                                              #d121c0bd: 250,
+                                                              #d121c0bd: 252,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -5486,7 +5488,7 @@
                                                               <#c3b129f9:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    251,
+                                                                    253,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5504,7 +5506,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    252,
+                                                                    254,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5520,7 +5522,7 @@
                                                                     <#3231247e:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    253,
+                                                                    255,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5536,7 +5538,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    166
+                                                                    168
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>
@@ -5565,7 +5567,7 @@
                                                               <#c3b129f9:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    254,
+                                                                    256,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5583,7 +5585,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    255,
+                                                                    257,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5599,7 +5601,7 @@
                                                                     <#32854f53:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    256,
+                                                                    258,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5615,7 +5617,7 @@
                                                                     <#0fb8fb71:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    257,
+                                                                    259,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5646,7 +5648,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    228
+                                                                    230
                                                                     }
                                                                     },
                                                                     {
@@ -5657,7 +5659,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    228
+                                                                    230
                                                                     }
                                                                     },
                                                                     {
@@ -5708,7 +5710,7 @@
                                           [
                                             <#11c182d1:
                                                ({
-                                                  #d121c0bd: 258,
+                                                  #d121c0bd: 260,
                                                   #21793419:
                                                     ({ #c68b4ed6: 5 },
                                                      { #c68b4ed6: 36 }),
@@ -5724,7 +5726,7 @@
                                                   #fe93c404:
                                                     <#d0cddcea:
                                                        ({
-                                                          #d121c0bd: 248,
+                                                          #d121c0bd: 250,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 23
@@ -5737,7 +5739,7 @@
                                                           <#c3b129f9:
                                                              ({
                                                                 #d121c0bd:
-                                                                  249,
+                                                                  251,
                                                                 #21793419:
                                                                   ({
                                                                     #c68b4ed6:
@@ -5752,7 +5754,7 @@
                                                                 <#f0ddca4d:
                                                                    ({
                                                                     #d121c0bd:
-                                                                    250,
+                                                                    252,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5768,7 +5770,7 @@
                                                                     <#c3b129f9:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    251,
+                                                                    253,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5784,7 +5786,7 @@
                                                                     <#ff6ba872:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    252,
+                                                                    254,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5800,7 +5802,7 @@
                                                                     <#3231247e:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    253,
+                                                                    255,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5816,7 +5818,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    166
+                                                                    168
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>
@@ -5845,7 +5847,7 @@
                                                                     <#c3b129f9:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    254,
+                                                                    256,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5861,7 +5863,7 @@
                                                                     <#c3b129f9:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    255,
+                                                                    257,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5877,7 +5879,7 @@
                                                                     <#32854f53:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    256,
+                                                                    258,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5893,7 +5895,7 @@
                                                                     <#0fb8fb71:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    257,
+                                                                    259,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -5924,7 +5926,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    228
+                                                                    230
                                                                     }
                                                                     },
                                                                     {
@@ -5935,7 +5937,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    228
+                                                                    230
                                                                     }
                                                                     },
                                                                     {
@@ -5991,7 +5993,7 @@
                                           ])>,
                                       <#d0cddcea:
                                          ({
-                                            #d121c0bd: 259,
+                                            #d121c0bd: 261,
                                             #21793419:
                                               ({
                                                  #c7b317f4: 52,
@@ -6002,7 +6004,7 @@
                                           [
                                             <#c59ea513:
                                                ({
-                                                  #d121c0bd: 260,
+                                                  #d121c0bd: 262,
                                                   #21793419:
                                                     ({ #c68b4ed6: 5 },
                                                      { #c68b4ed6: 35 })
@@ -6010,7 +6012,7 @@
                                                 [
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 261,
+                                                        #d121c0bd: 263,
                                                         #21793419:
                                                           ({ #c68b4ed6: 5 },
                                                            { #c68b4ed6: 5 })
@@ -6018,7 +6020,7 @@
                                                       [
                                                         <#e9db58be:
                                                            ({
-                                                              #d121c0bd: 262,
+                                                              #d121c0bd: 264,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -6032,14 +6034,14 @@
                                                             [],
                                                             {
                                                               #30e4876a: {
-                                                                #c1127ea9: 90
+                                                                #c1127ea9: 91
                                                               }
                                                             },
                                                             {
                                                               #c369ebbe: {
                                                                 #c709e154:
                                                                   <#ee046738>,
-                                                                #ec05e4a8: 92,
+                                                                #ec05e4a8: 93,
                                                                 #c8ff724b: {
                                                                   #c8ff724b:
                                                                     "NSLog",
@@ -6049,14 +6051,14 @@
                                                                 },
                                                                 #30e4876a: {
                                                                   #c1127ea9:
-                                                                    90
+                                                                    91
                                                                 }
                                                               }
                                                             })>
                                                       ],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 162
+                                                          #c1127ea9: 164
                                                         }
                                                       },
                                                       {
@@ -6066,7 +6068,7 @@
                                                       })>,
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 263,
+                                                        #d121c0bd: 265,
                                                         #21793419:
                                                           ({ #c68b4ed6: 11 },
                                                            { #c68b4ed6: 12 })
@@ -6074,7 +6076,7 @@
                                                       [
                                                         <#ff6ba872:
                                                            ({
-                                                              #d121c0bd: 264,
+                                                              #d121c0bd: 266,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -6089,7 +6091,7 @@
                                                               <#3231247e:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    265,
+                                                                    267,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6105,7 +6107,7 @@
                                                                   {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    166
+                                                                    168
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>
@@ -6130,7 +6132,7 @@
                                                       })>,
                                                   <#26afa8d2:
                                                      ({
-                                                        #d121c0bd: 266,
+                                                        #d121c0bd: 268,
                                                         #21793419:
                                                           ({ #c68b4ed6: 20 },
                                                            { #c68b4ed6: 34 })
@@ -6138,7 +6140,7 @@
                                                       [
                                                         <#f28ad889:
                                                            ({
-                                                              #d121c0bd: 267,
+                                                              #d121c0bd: 269,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -6153,7 +6155,7 @@
                                                               <#0d679c05:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    268,
+                                                                    270,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6179,7 +6181,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    269,
+                                                                    271,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6195,7 +6197,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    270,
+                                                                    272,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6221,7 +6223,7 @@
                                                                     #c709e154:
                                                                     <#004196c7>,
                                                                     #ec05e4a8:
-                                                                    258,
+                                                                    260,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "d",
@@ -6252,7 +6254,7 @@
                                                               <#0d679c05:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    271,
+                                                                    273,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6278,7 +6280,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    272,
+                                                                    274,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6294,7 +6296,7 @@
                                                                     <#3231247e:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    273,
+                                                                    275,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6310,7 +6312,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    274
+                                                                    276
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>
@@ -6330,7 +6332,7 @@
                                                             {
                                                               #30e4876a: {
                                                                 #c1127ea9:
-                                                                  205
+                                                                  207
                                                               },
                                                               #0e89e422:
                                                                 <#28055b85>,
@@ -6343,7 +6345,7 @@
                                                             })>,
                                                         <#0d679c05:
                                                            ({
-                                                              #d121c0bd: 268,
+                                                              #d121c0bd: 270,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -6365,7 +6367,7 @@
                                                                 <#c3b129f9:
                                                                    ({
                                                                     #d121c0bd:
-                                                                    269,
+                                                                    271,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6381,7 +6383,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    270,
+                                                                    272,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6407,7 +6409,7 @@
                                                                     #c709e154:
                                                                     <#004196c7>,
                                                                     #ec05e4a8:
-                                                                    258,
+                                                                    260,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "d",
@@ -6437,7 +6439,7 @@
                                                             })>,
                                                         <#0d679c05:
                                                            ({
-                                                              #d121c0bd: 271,
+                                                              #d121c0bd: 273,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -6459,7 +6461,7 @@
                                                                 <#ff6ba872:
                                                                    ({
                                                                     #d121c0bd:
-                                                                    272,
+                                                                    274,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6475,7 +6477,7 @@
                                                                     <#3231247e:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    273,
+                                                                    275,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6491,7 +6493,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    274
+                                                                    276
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>
@@ -6509,7 +6511,7 @@
                                                             })>,
                                                         <#c3b129f9:
                                                            ({
-                                                              #d121c0bd: 275,
+                                                              #d121c0bd: 277,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -6524,7 +6526,7 @@
                                                               <#f104c570:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    276,
+                                                                    278,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6542,7 +6544,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    268,
+                                                                    270,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6568,7 +6570,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    269,
+                                                                    271,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6584,7 +6586,7 @@
                                                                     <#e9db58be:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    270,
+                                                                    272,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6610,7 +6612,7 @@
                                                                     #c709e154:
                                                                     <#004196c7>,
                                                                     #ec05e4a8:
-                                                                    258,
+                                                                    260,
                                                                     #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "d",
@@ -6643,7 +6645,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    277,
+                                                                    279,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6659,7 +6661,7 @@
                                                                     <#0d679c05:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    271,
+                                                                    273,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6685,7 +6687,7 @@
                                                                     (
                                                                     {
                                                                     #d121c0bd:
-                                                                    272,
+                                                                    274,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6701,7 +6703,7 @@
                                                                     <#3231247e:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    273,
+                                                                    275,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6717,7 +6719,7 @@
                                                                     {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    274
+                                                                    276
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>
@@ -6779,16 +6781,16 @@
                                                 ],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 101
+                                                    #c1127ea9: 103
                                                   }
                                                 })>
                                           ],
-                                          { #30e4876a: { #c1127ea9: 101 } },
+                                          { #30e4876a: { #c1127ea9: 103 } },
                                           { })>
                                     ])>,
                                 <#d8411b84:
                                    ({
-                                      #d121c0bd: 278,
+                                      #d121c0bd: 280,
                                       #21793419:
                                         ({ #c7b317f4: 53, #c68b4ed6: 5 },
                                          { #c7b317f4: 55, #c68b4ed6: 3 })
@@ -6796,7 +6798,7 @@
                                     [
                                       <#d394bb73:
                                          ({
-                                            #d121c0bd: 279,
+                                            #d121c0bd: 281,
                                             #21793419:
                                               ({
                                                  #c7b317f4: 53,
@@ -6810,7 +6812,7 @@
                                           [
                                             <#c59ea513:
                                                ({
-                                                  #d121c0bd: 280,
+                                                  #d121c0bd: 282,
                                                   #21793419:
                                                     ({
                                                        #c7b317f4: 54,
@@ -6821,7 +6823,7 @@
                                                 [
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 281,
+                                                        #d121c0bd: 283,
                                                         #21793419:
                                                           ({ #c68b4ed6: 5 },
                                                            { #c68b4ed6: 5 })
@@ -6829,7 +6831,7 @@
                                                       [
                                                         <#e9db58be:
                                                            ({
-                                                              #d121c0bd: 282,
+                                                              #d121c0bd: 284,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -6843,14 +6845,14 @@
                                                             [],
                                                             {
                                                               #30e4876a: {
-                                                                #c1127ea9: 90
+                                                                #c1127ea9: 91
                                                               }
                                                             },
                                                             {
                                                               #c369ebbe: {
                                                                 #c709e154:
                                                                   <#ee046738>,
-                                                                #ec05e4a8: 92,
+                                                                #ec05e4a8: 93,
                                                                 #c8ff724b: {
                                                                   #c8ff724b:
                                                                     "NSLog",
@@ -6860,14 +6862,14 @@
                                                                 },
                                                                 #30e4876a: {
                                                                   #c1127ea9:
-                                                                    90
+                                                                    91
                                                                 }
                                                               }
                                                             })>
                                                       ],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 162
+                                                          #c1127ea9: 164
                                                         }
                                                       },
                                                       {
@@ -6877,7 +6879,7 @@
                                                       })>,
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 283,
+                                                        #d121c0bd: 285,
                                                         #21793419:
                                                           ({ #c68b4ed6: 11 },
                                                            { #c68b4ed6: 12 })
@@ -6885,7 +6887,7 @@
                                                       [
                                                         <#ff6ba872:
                                                            ({
-                                                              #d121c0bd: 284,
+                                                              #d121c0bd: 286,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -6900,7 +6902,7 @@
                                                               <#3231247e:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    285,
+                                                                    287,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -6916,7 +6918,7 @@
                                                                   {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    286
+                                                                    288
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>
@@ -6943,7 +6945,7 @@
                                                       })>,
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 287,
+                                                        #d121c0bd: 289,
                                                         #21793419:
                                                           ({ #c68b4ed6: 29 },
                                                            { #c68b4ed6: 29 })
@@ -6951,7 +6953,7 @@
                                                       [
                                                         <#e9db58be:
                                                            ({
-                                                              #d121c0bd: 288,
+                                                              #d121c0bd: 290,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -6966,7 +6968,7 @@
                                                             {
                                                               #30e4876a: {
                                                                 #c1127ea9:
-                                                                  289
+                                                                  291
                                                               },
                                                               #0e89e422:
                                                                 <#28055b85>
@@ -6976,7 +6978,7 @@
                                                                 #c709e154:
                                                                   <#004196c7>,
                                                                 #ec05e4a8:
-                                                                  290,
+                                                                  292,
                                                                 #c8ff724b: {
                                                                   #c8ff724b:
                                                                     "e",
@@ -6986,14 +6988,14 @@
                                                                 },
                                                                 #30e4876a: {
                                                                   #c1127ea9:
-                                                                    289
+                                                                    291
                                                                 }
                                                               }
                                                             })>
                                                       ],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 289
+                                                          #c1127ea9: 291
                                                         }
                                                       },
                                                       {
@@ -7004,7 +7006,7 @@
                                                 ],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 101
+                                                    #c1127ea9: 103
                                                   }
                                                 })>
                                           ])>
@@ -7012,7 +7014,7 @@
                                     <#263f4272:
                                        <#11c182d1:
                                           ({
-                                             #d121c0bd: 290,
+                                             #d121c0bd: 292,
                                              #21793419:
                                                ({
                                                   #c7b317f4: 53,
@@ -7026,11 +7028,11 @@
                                              #c8ff724b: "e",
                                              #2cdb06fb: [ "e" ]
                                            },
-                                           { #c1127ea9: 289 },
+                                           { #c1127ea9: 291 },
                                            { })>>)>,
                                 <#d557450c:
                                    ({
-                                      #d121c0bd: 291,
+                                      #d121c0bd: 293,
                                       #21793419:
                                         ({ #c7b317f4: 55, #c68b4ed6: 5 },
                                          { #c7b317f4: 57, #c68b4ed6: 3 })
@@ -7038,7 +7040,7 @@
                                     [
                                       <#d394bb73:
                                          ({
-                                            #d121c0bd: 292,
+                                            #d121c0bd: 294,
                                             #21793419:
                                               ({
                                                  #c7b317f4: 55,
@@ -7052,7 +7054,7 @@
                                           [
                                             <#c59ea513:
                                                ({
-                                                  #d121c0bd: 293,
+                                                  #d121c0bd: 295,
                                                   #21793419:
                                                     ({
                                                        #c7b317f4: 56,
@@ -7063,7 +7065,7 @@
                                                 [
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 294,
+                                                        #d121c0bd: 296,
                                                         #21793419:
                                                           ({ #c68b4ed6: 5 },
                                                            { #c68b4ed6: 5 })
@@ -7071,7 +7073,7 @@
                                                       [
                                                         <#e9db58be:
                                                            ({
-                                                              #d121c0bd: 295,
+                                                              #d121c0bd: 297,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -7085,14 +7087,14 @@
                                                             [],
                                                             {
                                                               #30e4876a: {
-                                                                #c1127ea9: 90
+                                                                #c1127ea9: 91
                                                               }
                                                             },
                                                             {
                                                               #c369ebbe: {
                                                                 #c709e154:
                                                                   <#ee046738>,
-                                                                #ec05e4a8: 92,
+                                                                #ec05e4a8: 93,
                                                                 #c8ff724b: {
                                                                   #c8ff724b:
                                                                     "NSLog",
@@ -7102,14 +7104,14 @@
                                                                 },
                                                                 #30e4876a: {
                                                                   #c1127ea9:
-                                                                    90
+                                                                    91
                                                                 }
                                                               }
                                                             })>
                                                       ],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 162
+                                                          #c1127ea9: 164
                                                         }
                                                       },
                                                       {
@@ -7119,7 +7121,7 @@
                                                       })>,
                                                   <#c3b129f9:
                                                      ({
-                                                        #d121c0bd: 296,
+                                                        #d121c0bd: 298,
                                                         #21793419:
                                                           ({ #c68b4ed6: 11 },
                                                            { #c68b4ed6: 12 })
@@ -7127,7 +7129,7 @@
                                                       [
                                                         <#ff6ba872:
                                                            ({
-                                                              #d121c0bd: 297,
+                                                              #d121c0bd: 299,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -7142,7 +7144,7 @@
                                                               <#3231247e:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    298,
+                                                                    300,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -7158,7 +7160,7 @@
                                                                   {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    299
+                                                                    301
                                                                     },
                                                                     #0e89e422:
                                                                     <#28055b85>
@@ -7186,7 +7188,7 @@
                                                 ],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 101
+                                                    #c1127ea9: 103
                                                   }
                                                 })>
                                           ])>
@@ -7194,16 +7196,16 @@
                               ])>,
                           <#e6e17dab:
                              ({
-                                #d121c0bd: 300,
+                                #d121c0bd: 302,
                                 #21793419:
                                   ({ #c7b317f4: 59, #c68b4ed6: 3 },
                                    { #c68b4ed6: 8 })
                               },
                               [],
-                              { #efaf0df4: "theend", #d121c0bd: 301 })>,
+                              { #efaf0df4: "theend", #d121c0bd: 303 })>,
                           <#df3bdb38:
                              ({
-                                #d121c0bd: 302,
+                                #d121c0bd: 304,
                                 #21793419:
                                   ({ #c7b317f4: 60, #c68b4ed6: 3 },
                                    { #c68b4ed6: 3 })
@@ -7211,7 +7213,7 @@
                               [])>,
                           <#ff87123c:
                              ({
-                                #d121c0bd: 303,
+                                #d121c0bd: 305,
                                 #21793419:
                                   ({ #c7b317f4: 61, #c68b4ed6: 1 },
                                    { #c7b317f4: 62, #c68b4ed6: 18 })
@@ -7219,14 +7221,14 @@
                               [
                                 <#c59ea513:
                                    ({
-                                      #d121c0bd: 304,
+                                      #d121c0bd: 306,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 18 })
                                     },
                                     [
                                       <#c3b129f9:
                                          ({
-                                            #d121c0bd: 305,
+                                            #d121c0bd: 307,
                                             #21793419:
                                               ({ #c68b4ed6: 3 },
                                                { #c68b4ed6: 3 })
@@ -7234,7 +7236,7 @@
                                           [
                                             <#e9db58be:
                                                ({
-                                                  #d121c0bd: 306,
+                                                  #d121c0bd: 308,
                                                   #21793419:
                                                     ({ #c68b4ed6: 3 },
                                                      { #c68b4ed6: 3 })
@@ -7242,31 +7244,31 @@
                                                 [],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 90
+                                                    #c1127ea9: 91
                                                   }
                                                 },
                                                 {
                                                   #c369ebbe: {
                                                     #c709e154: <#ee046738>,
-                                                    #ec05e4a8: 92,
+                                                    #ec05e4a8: 93,
                                                     #c8ff724b: {
                                                       #c8ff724b: "NSLog",
                                                       #2cdb06fb: [ "NSLog" ]
                                                     },
                                                     #30e4876a: {
-                                                      #c1127ea9: 90
+                                                      #c1127ea9: 91
                                                     }
                                                   }
                                                 })>
                                           ],
-                                          { #30e4876a: { #c1127ea9: 162 } },
+                                          { #30e4876a: { #c1127ea9: 164 } },
                                           {
                                             #c91e0a14: <#210490b0>,
                                             #fa1a3bd3: []
                                           })>,
                                       <#c3b129f9:
                                          ({
-                                            #d121c0bd: 307,
+                                            #d121c0bd: 309,
                                             #21793419:
                                               ({ #c68b4ed6: 9 },
                                                { #c68b4ed6: 10 })
@@ -7274,7 +7276,7 @@
                                           [
                                             <#ff6ba872:
                                                ({
-                                                  #d121c0bd: 308,
+                                                  #d121c0bd: 310,
                                                   #21793419:
                                                     ({ #c68b4ed6: 9 },
                                                      { #c68b4ed6: 10 })
@@ -7282,7 +7284,7 @@
                                                 [
                                                   <#3231247e:
                                                      ({
-                                                        #d121c0bd: 309,
+                                                        #d121c0bd: 311,
                                                         #21793419:
                                                           ({ #c68b4ed6: 10 },
                                                            { #c68b4ed6: 10 })
@@ -7290,7 +7292,7 @@
                                                       [],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 310
+                                                          #c1127ea9: 312
                                                         },
                                                         #0e89e422:
                                                           <#28055b85>
@@ -7309,7 +7311,7 @@
                                             #fa1a3bd3: []
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 101 } })>
+                                    { #30e4876a: { #c1127ea9: 103 } })>
                               ],
                               "theend")>
                         ])>,
@@ -7317,8 +7319,8 @@
                 })>,
             <#070ee654:
                ({
-                  #d121c0bd: 110,
-                  #f9005968: 146,
+                  #d121c0bd: 112,
+                  #f9005968: 148,
                   #21793419:
                     ({ #c7b317f4: 18, #c68b4ed6: 38 }, { #c68b4ed6: 38 })
                 },
@@ -7327,12 +7329,12 @@
                 { },
                 { #015a971f: true, #f9049e82: <#d6c054e3> })>,
             <#c1a9158b:
-               ({ #d121c0bd: 311, #21793419: ({ }, { #c68b4ed6: 38 }) },
+               ({ #d121c0bd: 313, #21793419: ({ }, { #c68b4ed6: 38 }) },
                 {
                   #d32dd232: <#009015ca>,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 107,
+                    #ec05e4a8: 109,
                     #c8ff724b: {
                       #c8ff724b: "str",
                       #2cdb06fb: [ "str", "MyClass" ]
@@ -7340,7 +7342,7 @@
                   },
                   #2e0d396b: {
                     #c709e154: <#38103cca>,
-                    #ec05e4a8: 110,
+                    #ec05e4a8: 112,
                     #c8ff724b: {
                       #c8ff724b: "_str",
                       #2cdb06fb: [ "_str", "MyClass" ]
@@ -7350,22 +7352,22 @@
                 })>,
             <#070ee654:
                ({
-                  #d121c0bd: 115,
-                  #f9005968: 146,
+                  #d121c0bd: 117,
+                  #f9005968: 148,
                   #21793419:
                     ({ #c7b317f4: 20, #c68b4ed6: 36 }, { #c68b4ed6: 36 })
                 },
                 { #c8ff724b: "_x", #2cdb06fb: [ "_x", "MyClass" ] },
-                { #c1127ea9: 112 },
+                { #c1127ea9: 114 },
                 { },
                 { #015a971f: true, #f9049e82: <#d6c054e3> })>,
             <#c1a9158b:
-               ({ #d121c0bd: 312, #21793419: ({ }, { #c68b4ed6: 36 }) },
+               ({ #d121c0bd: 314, #21793419: ({ }, { #c68b4ed6: 36 }) },
                 {
                   #d32dd232: <#009015ca>,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 111,
+                    #ec05e4a8: 113,
                     #c8ff724b: {
                       #c8ff724b: "x",
                       #2cdb06fb: [ "x", "MyClass" ]
@@ -7373,18 +7375,18 @@
                   },
                   #2e0d396b: {
                     #c709e154: <#38103cca>,
-                    #ec05e4a8: 115,
+                    #ec05e4a8: 117,
                     #c8ff724b: {
                       #c8ff724b: "_x",
                       #2cdb06fb: [ "_x", "MyClass" ]
                     },
-                    #30e4876a: { #c1127ea9: 112 }
+                    #30e4876a: { #c1127ea9: 114 }
                   }
                 })>,
             <#070ee654:
                ({
-                  #d121c0bd: 119,
-                  #f9005968: 146,
+                  #d121c0bd: 121,
+                  #f9005968: 148,
                   #21793419:
                     ({ #c7b317f4: 21, #c68b4ed6: 34 }, { #c68b4ed6: 34 })
                 },
@@ -7393,12 +7395,12 @@
                 { },
                 { #015a971f: true, #f9049e82: <#d6c054e3> })>,
             <#c1a9158b:
-               ({ #d121c0bd: 313, #21793419: ({ }, { #c68b4ed6: 34 }) },
+               ({ #d121c0bd: 315, #21793419: ({ }, { #c68b4ed6: 34 }) },
                 {
                   #d32dd232: <#009015ca>,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 116,
+                    #ec05e4a8: 118,
                     #c8ff724b: {
                       #c8ff724b: "y",
                       #2cdb06fb: [ "y", "MyClass" ]
@@ -7406,7 +7408,7 @@
                   },
                   #2e0d396b: {
                     #c709e154: <#38103cca>,
-                    #ec05e4a8: 119,
+                    #ec05e4a8: 121,
                     #c8ff724b: {
                       #c8ff724b: "_y",
                       #2cdb06fb: [ "_y", "MyClass" ]
@@ -7416,8 +7418,8 @@
                 })>,
             <#070ee654:
                ({
-                  #d121c0bd: 124,
-                  #f9005968: 146,
+                  #d121c0bd: 126,
+                  #f9005968: 148,
                   #21793419:
                     ({ #c7b317f4: 22, #c68b4ed6: 54 }, { #c68b4ed6: 54 })
                 },
@@ -7425,16 +7427,16 @@
                   #c8ff724b: "_delegate",
                   #2cdb06fb: [ "_delegate", "MyClass" ]
                 },
-                { #c1127ea9: 121 },
+                { #c1127ea9: 123 },
                 { },
                 { #015a971f: true, #f9049e82: <#d6c054e3> })>,
             <#c1a9158b:
-               ({ #d121c0bd: 314, #21793419: ({ }, { #c68b4ed6: 54 }) },
+               ({ #d121c0bd: 316, #21793419: ({ }, { #c68b4ed6: 54 }) },
                 {
                   #d32dd232: <#009015ca>,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 120,
+                    #ec05e4a8: 122,
                     #c8ff724b: {
                       #c8ff724b: "delegate",
                       #2cdb06fb: [ "delegate", "MyClass" ]
@@ -7442,18 +7444,18 @@
                   },
                   #2e0d396b: {
                     #c709e154: <#38103cca>,
-                    #ec05e4a8: 124,
+                    #ec05e4a8: 126,
                     #c8ff724b: {
                       #c8ff724b: "_delegate",
                       #2cdb06fb: [ "_delegate", "MyClass" ]
                     },
-                    #30e4876a: { #c1127ea9: 121 }
+                    #30e4876a: { #c1127ea9: 123 }
                   }
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 315,
-                  #f9005968: 146,
+                  #d121c0bd: 317,
+                  #f9005968: 148,
                   #21793419:
                     ({ #c7b317f4: 18, #c68b4ed6: 38 }, { #c68b4ed6: 38 }),
                   #eb8a1f5a: true
@@ -7465,7 +7467,7 @@
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 107,
+                    #ec05e4a8: 109,
                     #c8ff724b: {
                       #c8ff724b: "str",
                       #2cdb06fb: [ "str", "MyClass" ]
@@ -7474,16 +7476,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 125,
+                          #d121c0bd: 127,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 127,
+                          #d121c0bd: 129,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -7495,19 +7497,19 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 211,
-                  #f9005968: 146,
+                  #d121c0bd: 213,
+                  #f9005968: 148,
                   #21793419: ({ #c68b4ed6: 38 }, { #c68b4ed6: 38 }),
                   #eb8a1f5a: true
                 },
                 { #c8ff724b: "setStr:", #2cdb06fb: [ "setStr:", "MyClass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 107,
+                    #ec05e4a8: 109,
                     #c8ff724b: {
                       #c8ff724b: "str",
                       #2cdb06fb: [ "str", "MyClass" ]
@@ -7516,7 +7518,7 @@
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 128,
+                          #d121c0bd: 130,
                           #21793419: ({ #c68b4ed6: 38 }, { #c68b4ed6: 38 })
                         },
                         { #c8ff724b: "str", #2cdb06fb: [ "str" ] },
@@ -7526,16 +7528,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 129,
+                          #d121c0bd: 131,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 130,
+                          #d121c0bd: 132,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -7547,8 +7549,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 316,
-                  #f9005968: 146,
+                  #d121c0bd: 318,
+                  #f9005968: 148,
                   #21793419:
                     ({ #c7b317f4: 20, #c68b4ed6: 36 }, { #c68b4ed6: 36 }),
                   #eb8a1f5a: true
@@ -7556,11 +7558,11 @@
                 { #c8ff724b: "x", #2cdb06fb: [ "x", "MyClass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 112 },
+                  #137b649c: { #c1127ea9: 114 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 111,
+                    #ec05e4a8: 113,
                     #c8ff724b: {
                       #c8ff724b: "x",
                       #2cdb06fb: [ "x", "MyClass" ]
@@ -7569,16 +7571,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 131,
+                          #d121c0bd: 133,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 132,
+                          #d121c0bd: 134,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -7590,19 +7592,19 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 317,
-                  #f9005968: 146,
+                  #d121c0bd: 319,
+                  #f9005968: 148,
                   #21793419: ({ #c68b4ed6: 36 }, { #c68b4ed6: 36 }),
                   #eb8a1f5a: true
                 },
                 { #c8ff724b: "setX:", #2cdb06fb: [ "setX:", "MyClass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 111,
+                    #ec05e4a8: 113,
                     #c8ff724b: {
                       #c8ff724b: "x",
                       #2cdb06fb: [ "x", "MyClass" ]
@@ -7611,26 +7613,26 @@
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 133,
+                          #d121c0bd: 135,
                           #21793419: ({ #c68b4ed6: 36 }, { #c68b4ed6: 36 })
                         },
                         { #c8ff724b: "x", #2cdb06fb: [ "x" ] },
-                        { #c1127ea9: 112 },
+                        { #c1127ea9: 114 },
                         { #0370b1b2: 0 })>
                   ],
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 134,
+                          #d121c0bd: 136,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 135,
+                          #d121c0bd: 137,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -7642,8 +7644,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 318,
-                  #f9005968: 146,
+                  #d121c0bd: 320,
+                  #f9005968: 148,
                   #21793419:
                     ({ #c7b317f4: 21, #c68b4ed6: 34 }, { #c68b4ed6: 34 }),
                   #eb8a1f5a: true
@@ -7655,7 +7657,7 @@
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 116,
+                    #ec05e4a8: 118,
                     #c8ff724b: {
                       #c8ff724b: "y",
                       #2cdb06fb: [ "y", "MyClass" ]
@@ -7664,16 +7666,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 136,
+                          #d121c0bd: 138,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 137,
+                          #d121c0bd: 139,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -7685,19 +7687,19 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 319,
-                  #f9005968: 146,
+                  #d121c0bd: 321,
+                  #f9005968: 148,
                   #21793419: ({ #c68b4ed6: 34 }, { #c68b4ed6: 34 }),
                   #eb8a1f5a: true
                 },
                 { #c8ff724b: "setY:", #2cdb06fb: [ "setY:", "MyClass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 116,
+                    #ec05e4a8: 118,
                     #c8ff724b: {
                       #c8ff724b: "y",
                       #2cdb06fb: [ "y", "MyClass" ]
@@ -7706,7 +7708,7 @@
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 138,
+                          #d121c0bd: 140,
                           #21793419: ({ #c68b4ed6: 34 }, { #c68b4ed6: 34 })
                         },
                         { #c8ff724b: "y", #2cdb06fb: [ "y" ] },
@@ -7716,16 +7718,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 139,
+                          #d121c0bd: 141,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 140,
+                          #d121c0bd: 142,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -7737,8 +7739,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 320,
-                  #f9005968: 146,
+                  #d121c0bd: 322,
+                  #f9005968: 148,
                   #21793419:
                     ({ #c7b317f4: 22, #c68b4ed6: 54 }, { #c68b4ed6: 54 }),
                   #eb8a1f5a: true
@@ -7749,11 +7751,11 @@
                 },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 121 },
+                  #137b649c: { #c1127ea9: 123 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 120,
+                    #ec05e4a8: 122,
                     #c8ff724b: {
                       #c8ff724b: "delegate",
                       #2cdb06fb: [ "delegate", "MyClass" ]
@@ -7762,16 +7764,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 141,
+                          #d121c0bd: 143,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 142,
+                          #d121c0bd: 144,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -7783,8 +7785,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 321,
-                  #f9005968: 146,
+                  #d121c0bd: 323,
+                  #f9005968: 148,
                   #21793419: ({ #c68b4ed6: 54 }, { #c68b4ed6: 54 }),
                   #eb8a1f5a: true
                 },
@@ -7794,11 +7796,11 @@
                 },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #001e675c: true,
                   #2c8fcfd4: {
                     #c709e154: <#f9260501>,
-                    #ec05e4a8: 120,
+                    #ec05e4a8: 122,
                     #c8ff724b: {
                       #c8ff724b: "delegate",
                       #2cdb06fb: [ "delegate", "MyClass" ]
@@ -7807,26 +7809,26 @@
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 143,
+                          #d121c0bd: 145,
                           #21793419: ({ #c68b4ed6: 54 }, { #c68b4ed6: 54 })
                         },
                         { #c8ff724b: "delegate", #2cdb06fb: [ "delegate" ] },
-                        { #c1127ea9: 121 },
+                        { #c1127ea9: 123 },
                         { #0370b1b2: 0 })>
                   ],
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 144,
+                          #d121c0bd: 146,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 145,
+                          #d121c0bd: 147,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -7841,13 +7843,13 @@
           {
             #2ec29bb2: {
               #c709e154: <#3cf18b8d>,
-              #ec05e4a8: 106,
+              #ec05e4a8: 108,
               #c8ff724b: { #c8ff724b: "MyClass", #2cdb06fb: [ "MyClass" ] }
             }
           })>,
       <#3a378134:
          ({
-            #d121c0bd: 147,
+            #d121c0bd: 149,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 67, #c68b4ed6: 1 },
@@ -7857,19 +7859,19 @@
           [
             <#3ccd3797:
                ({
-                  #d121c0bd: 322,
-                  #f9005968: 147,
+                  #d121c0bd: 324,
+                  #f9005968: 149,
                   #21793419:
                     ({ #c7b317f4: 69, #c68b4ed6: 1 }, { #c68b4ed6: 26 })
                 },
                 { #c8ff724b: "bar:", #2cdb06fb: [ "bar:", "MyCategory" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 323,
+                          #d121c0bd: 325,
                           #21793419: ({ #c68b4ed6: 14 }, { #c68b4ed6: 25 })
                         },
                         { #c8ff724b: "s", #2cdb06fb: [ "s" ] },
@@ -7879,16 +7881,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 324,
+                          #d121c0bd: 326,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 325,
+                          #d121c0bd: 327,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -7903,12 +7905,12 @@
           {
             #2ec29bb2: {
               #c709e154: <#3cf18b8d>,
-              #ec05e4a8: 106,
+              #ec05e4a8: 108,
               #c8ff724b: { #c8ff724b: "MyClass", #2cdb06fb: [ "MyClass" ] }
             },
             #d32dd232: {
               #c709e154: <#3d8bafaa>,
-              #ec05e4a8: 326,
+              #ec05e4a8: 328,
               #c8ff724b: {
                 #c8ff724b: "MyCategory",
                 #2cdb06fb: [ "MyCategory" ]
@@ -7917,7 +7919,7 @@
           })>,
       <#0ded4934:
          ({
-            #d121c0bd: 326,
+            #d121c0bd: 328,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 73, #c68b4ed6: 1 },
@@ -7927,8 +7929,8 @@
           [
             <#3ccd3797:
                ({
-                  #d121c0bd: 327,
-                  #f9005968: 326,
+                  #d121c0bd: 329,
+                  #f9005968: 328,
                   #21793419:
                     ({ #c7b317f4: 75, #c68b4ed6: 1 },
                      { #c7b317f4: 79, #c68b4ed6: 1 })
@@ -7936,11 +7938,11 @@
                 { #c8ff724b: "bar:", #2cdb06fb: [ "bar:", "MyCategory" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 328,
+                          #d121c0bd: 330,
                           #21793419:
                             ({ #c7b317f4: 75, #c68b4ed6: 14 },
                              { #c68b4ed6: 25 })
@@ -7952,18 +7954,18 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 329,
+                          #d121c0bd: 331,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true,
                           #0a16e1f2: true,
                           #d3368c8a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 126, #ea1a680e: true },
+                        { #c1127ea9: 128, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 330,
+                          #d121c0bd: 332,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -7974,7 +7976,7 @@
                   #c11b7aa2:
                     <#d394bb73:
                        ({
-                          #d121c0bd: 331,
+                          #d121c0bd: 333,
                           #21793419:
                             ({ #c68b4ed6: 27 },
                              { #c7b317f4: 79, #c68b4ed6: 1 })
@@ -7982,7 +7984,7 @@
                         [
                           <#26afa8d2:
                              ({
-                                #d121c0bd: 332,
+                                #d121c0bd: 334,
                                 #21793419:
                                   ({ #c7b317f4: 76, #c68b4ed6: 3 },
                                    { #c68b4ed6: 12 })
@@ -7990,14 +7992,14 @@
                               [
                                 <#d49390e5:
                                    ({
-                                      #d121c0bd: 333,
+                                      #d121c0bd: 335,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 12 })
                                     },
                                     [
                                       <#e9c8dd27:
                                          ({
-                                            #d121c0bd: 334,
+                                            #d121c0bd: 336,
                                             #21793419:
                                               ({ #c68b4ed6: 3 },
                                                { #c68b4ed6: 8 })
@@ -8005,7 +8007,7 @@
                                           [
                                             <#0d679c05:
                                                ({
-                                                  #d121c0bd: 335,
+                                                  #d121c0bd: 337,
                                                   #21793419:
                                                     ({ #c68b4ed6: 3 },
                                                      { #c68b4ed6: 3 })
@@ -8013,14 +8015,14 @@
                                                 [],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 126
+                                                    #c1127ea9: 128
                                                   }
                                                 },
                                                 {
                                                   #12076e59:
                                                     <#c3b129f9:
                                                        ({
-                                                          #d121c0bd: 336,
+                                                          #d121c0bd: 338,
                                                           #21793419:
                                                             ({ #c68b4ed6: 3 },
                                                              { #c68b4ed6: 3 })
@@ -8029,7 +8031,7 @@
                                                           <#e9db58be:
                                                              ({
                                                                 #d121c0bd:
-                                                                  337,
+                                                                  339,
                                                                 #21793419:
                                                                   ({
                                                                     #c68b4ed6:
@@ -8044,7 +8046,7 @@
                                                               {
                                                                 #30e4876a: {
                                                                   #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                   #ea1a680e:
                                                                     true
                                                                 },
@@ -8056,7 +8058,7 @@
                                                                   #c709e154:
                                                                     <#c6dba908>,
                                                                   #ec05e4a8:
-                                                                    329,
+                                                                    331,
                                                                   #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "self",
@@ -8066,7 +8068,7 @@
                                                                   },
                                                                   #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                   }
@@ -8075,7 +8077,7 @@
                                                         ],
                                                         {
                                                           #30e4876a: {
-                                                            #c1127ea9: 126
+                                                            #c1127ea9: 128
                                                           }
                                                         },
                                                         {
@@ -8086,7 +8088,7 @@
                                                 })>
                                           ],
                                           {
-                                            #30e4876a: { #c1127ea9: 205 },
+                                            #30e4876a: { #c1127ea9: 207 },
                                             #0e89e422: <#28055b85>,
                                             #d61caa14: <#f9260501>
                                           },
@@ -8094,7 +8096,7 @@
                                             #c709e154:
                                               <#fac503de: {
                                                  #c709e154: <#f9260501>,
-                                                 #ec05e4a8: 111,
+                                                 #ec05e4a8: 113,
                                                  #c8ff724b: {
                                                    #c8ff724b: "x",
                                                    #2cdb06fb: [
@@ -8106,18 +8108,18 @@
                                           })>,
                                       <#0d679c05:
                                          ({
-                                            #d121c0bd: 338,
+                                            #d121c0bd: 340,
                                             #21793419:
                                               ({ #c68b4ed6: 12 },
                                                { #c68b4ed6: 12 })
                                           },
                                           [],
-                                          { #30e4876a: { #c1127ea9: 112 } },
+                                          { #30e4876a: { #c1127ea9: 114 } },
                                           {
                                             #12076e59:
                                               <#02335a3f:
                                                  ({
-                                                    #d121c0bd: 339,
+                                                    #d121c0bd: 341,
                                                     #21793419:
                                                       ({ #c68b4ed6: 12 },
                                                        { #c68b4ed6: 12 })
@@ -8125,7 +8127,7 @@
                                                   [
                                                     <#ca9fafa2:
                                                        ({
-                                                          #d121c0bd: 340,
+                                                          #d121c0bd: 342,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 12
@@ -8138,7 +8140,7 @@
                                                           <#0fb8fb71:
                                                              ({
                                                                 #d121c0bd:
-                                                                  341,
+                                                                  343,
                                                                 #21793419:
                                                                   ({
                                                                     #c68b4ed6:
@@ -8166,7 +8168,7 @@
                                                         ],
                                                         {
                                                           #30e4876a: {
-                                                            #c1127ea9: 112
+                                                            #c1127ea9: 114
                                                           }
                                                         },
                                                         {
@@ -8174,30 +8176,30 @@
                                                             <#ecec00db>,
                                                           #fa1a3bd3: []
                                                         },
-                                                        { #c1127ea9: 112 })>
+                                                        { #c1127ea9: 114 })>
                                                   ],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 112
+                                                      #c1127ea9: 114
                                                     }
                                                   })>
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 112 } },
+                                    { #30e4876a: { #c1127ea9: 114 } },
                                     { #c709e154: <#009aba4f> })>,
                                 <#0d679c05:
                                    ({
-                                      #d121c0bd: 335,
+                                      #d121c0bd: 337,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 3 })
                                     },
                                     [],
-                                    { #30e4876a: { #c1127ea9: 126 } },
+                                    { #30e4876a: { #c1127ea9: 128 } },
                                     {
                                       #12076e59:
                                         <#c3b129f9:
                                            ({
-                                              #d121c0bd: 336,
+                                              #d121c0bd: 338,
                                               #21793419:
                                                 ({ #c68b4ed6: 3 },
                                                  { #c68b4ed6: 3 })
@@ -8205,7 +8207,7 @@
                                             [
                                               <#e9db58be:
                                                  ({
-                                                    #d121c0bd: 337,
+                                                    #d121c0bd: 339,
                                                     #21793419:
                                                       ({ #c68b4ed6: 3 },
                                                        { #c68b4ed6: 3 })
@@ -8213,7 +8215,7 @@
                                                   [],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 126,
+                                                      #c1127ea9: 128,
                                                       #ea1a680e: true
                                                     },
                                                     #0e89e422: <#28055b85>
@@ -8221,19 +8223,19 @@
                                                   {
                                                     #c369ebbe: {
                                                       #c709e154: <#c6dba908>,
-                                                      #ec05e4a8: 329,
+                                                      #ec05e4a8: 331,
                                                       #c8ff724b: {
                                                         #c8ff724b: "self",
                                                         #2cdb06fb: [ "self" ]
                                                       },
                                                       #30e4876a: {
-                                                        #c1127ea9: 126,
+                                                        #c1127ea9: 128,
                                                         #ea1a680e: true
                                                       }
                                                     }
                                                   })>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 126 } },
+                                            { #30e4876a: { #c1127ea9: 128 } },
                                             {
                                               #c91e0a14: <#f7495e1f>,
                                               #fa1a3bd3: []
@@ -8241,17 +8243,17 @@
                                     })>,
                                 <#0d679c05:
                                    ({
-                                      #d121c0bd: 338,
+                                      #d121c0bd: 340,
                                       #21793419:
                                         ({ #c68b4ed6: 12 }, { #c68b4ed6: 12 })
                                     },
                                     [],
-                                    { #30e4876a: { #c1127ea9: 112 } },
+                                    { #30e4876a: { #c1127ea9: 114 } },
                                     {
                                       #12076e59:
                                         <#02335a3f:
                                            ({
-                                              #d121c0bd: 339,
+                                              #d121c0bd: 341,
                                               #21793419:
                                                 ({ #c68b4ed6: 12 },
                                                  { #c68b4ed6: 12 })
@@ -8259,7 +8261,7 @@
                                             [
                                               <#ca9fafa2:
                                                  ({
-                                                    #d121c0bd: 340,
+                                                    #d121c0bd: 342,
                                                     #21793419:
                                                       ({ #c68b4ed6: 12 },
                                                        { #c68b4ed6: 12 })
@@ -8267,7 +8269,7 @@
                                                   [
                                                     <#0fb8fb71:
                                                        ({
-                                                          #d121c0bd: 341,
+                                                          #d121c0bd: 343,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 12
@@ -8290,38 +8292,38 @@
                                                   ],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 112
+                                                      #c1127ea9: 114
                                                     }
                                                   },
                                                   {
                                                     #c91e0a14: <#ecec00db>,
                                                     #fa1a3bd3: []
                                                   },
-                                                  { #c1127ea9: 112 })>
+                                                  { #c1127ea9: 114 })>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 112 } })>
+                                            { #30e4876a: { #c1127ea9: 114 } })>
                                     })>,
                                 <#f104c570:
                                    ({
-                                      #d121c0bd: 342,
+                                      #d121c0bd: 344,
                                       #21793419:
                                         ({ #c68b4ed6: 8 }, { #c68b4ed6: 8 })
                                     },
                                     [
                                       <#0d679c05:
                                          ({
-                                            #d121c0bd: 335,
+                                            #d121c0bd: 337,
                                             #21793419:
                                               ({ #c68b4ed6: 3 },
                                                { #c68b4ed6: 3 })
                                           },
                                           [],
-                                          { #30e4876a: { #c1127ea9: 126 } },
+                                          { #30e4876a: { #c1127ea9: 128 } },
                                           {
                                             #12076e59:
                                               <#c3b129f9:
                                                  ({
-                                                    #d121c0bd: 336,
+                                                    #d121c0bd: 338,
                                                     #21793419:
                                                       ({ #c68b4ed6: 3 },
                                                        { #c68b4ed6: 3 })
@@ -8329,7 +8331,7 @@
                                                   [
                                                     <#e9db58be:
                                                        ({
-                                                          #d121c0bd: 337,
+                                                          #d121c0bd: 339,
                                                           #21793419:
                                                             ({ #c68b4ed6: 3 },
                                                              { #c68b4ed6: 3 })
@@ -8337,7 +8339,7 @@
                                                         [],
                                                         {
                                                           #30e4876a: {
-                                                            #c1127ea9: 126,
+                                                            #c1127ea9: 128,
                                                             #ea1a680e: true
                                                           },
                                                           #0e89e422:
@@ -8347,7 +8349,7 @@
                                                           #c369ebbe: {
                                                             #c709e154:
                                                               <#c6dba908>,
-                                                            #ec05e4a8: 329,
+                                                            #ec05e4a8: 331,
                                                             #c8ff724b: {
                                                               #c8ff724b:
                                                                 "self",
@@ -8356,7 +8358,7 @@
                                                               ]
                                                             },
                                                             #30e4876a: {
-                                                              #c1127ea9: 126,
+                                                              #c1127ea9: 128,
                                                               #ea1a680e: true
                                                             }
                                                           }
@@ -8364,7 +8366,7 @@
                                                   ],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 126
+                                                      #c1127ea9: 128
                                                     }
                                                   },
                                                   {
@@ -8374,18 +8376,18 @@
                                           })>,
                                       <#0d679c05:
                                          ({
-                                            #d121c0bd: 338,
+                                            #d121c0bd: 340,
                                             #21793419:
                                               ({ #c68b4ed6: 12 },
                                                { #c68b4ed6: 12 })
                                           },
                                           [],
-                                          { #30e4876a: { #c1127ea9: 112 } },
+                                          { #30e4876a: { #c1127ea9: 114 } },
                                           {
                                             #12076e59:
                                               <#02335a3f:
                                                  ({
-                                                    #d121c0bd: 339,
+                                                    #d121c0bd: 341,
                                                     #21793419:
                                                       ({ #c68b4ed6: 12 },
                                                        { #c68b4ed6: 12 })
@@ -8393,7 +8395,7 @@
                                                   [
                                                     <#ca9fafa2:
                                                        ({
-                                                          #d121c0bd: 340,
+                                                          #d121c0bd: 342,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 12
@@ -8406,7 +8408,7 @@
                                                           <#0fb8fb71:
                                                              ({
                                                                 #d121c0bd:
-                                                                  341,
+                                                                  343,
                                                                 #21793419:
                                                                   ({
                                                                     #c68b4ed6:
@@ -8434,7 +8436,7 @@
                                                         ],
                                                         {
                                                           #30e4876a: {
-                                                            #c1127ea9: 112
+                                                            #c1127ea9: 114
                                                           }
                                                         },
                                                         {
@@ -8442,26 +8444,26 @@
                                                             <#ecec00db>,
                                                           #fa1a3bd3: []
                                                         },
-                                                        { #c1127ea9: 112 })>
+                                                        { #c1127ea9: 114 })>
                                                   ],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 112
+                                                      #c1127ea9: 114
                                                     }
                                                   })>
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 101 } },
+                                    { #30e4876a: { #c1127ea9: 103 } },
                                     {
                                       #316d331f: "setX:",
                                       #1ea99a8b: true,
-                                      #ec05e4a8: 317
+                                      #ec05e4a8: 319
                                     })>
                               ],
-                              { #30e4876a: { #c1127ea9: 112 } })>,
+                              { #30e4876a: { #c1127ea9: 114 } })>,
                           <#26afa8d2:
                              ({
-                                #d121c0bd: 343,
+                                #d121c0bd: 345,
                                 #21793419:
                                   ({ #c7b317f4: 77, #c68b4ed6: 3 },
                                    { #c68b4ed6: 12 })
@@ -8469,14 +8471,14 @@
                               [
                                 <#d49390e5:
                                    ({
-                                      #d121c0bd: 344,
+                                      #d121c0bd: 346,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 12 })
                                     },
                                     [
                                       <#e9c8dd27:
                                          ({
-                                            #d121c0bd: 345,
+                                            #d121c0bd: 347,
                                             #21793419:
                                               ({ #c68b4ed6: 3 },
                                                { #c68b4ed6: 8 })
@@ -8484,7 +8486,7 @@
                                           [
                                             <#0d679c05:
                                                ({
-                                                  #d121c0bd: 346,
+                                                  #d121c0bd: 348,
                                                   #21793419:
                                                     ({ #c68b4ed6: 3 },
                                                      { #c68b4ed6: 3 })
@@ -8492,14 +8494,14 @@
                                                 [],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 126
+                                                    #c1127ea9: 128
                                                   }
                                                 },
                                                 {
                                                   #12076e59:
                                                     <#c3b129f9:
                                                        ({
-                                                          #d121c0bd: 347,
+                                                          #d121c0bd: 349,
                                                           #21793419:
                                                             ({ #c68b4ed6: 3 },
                                                              { #c68b4ed6: 3 })
@@ -8508,7 +8510,7 @@
                                                           <#e9db58be:
                                                              ({
                                                                 #d121c0bd:
-                                                                  348,
+                                                                  350,
                                                                 #21793419:
                                                                   ({
                                                                     #c68b4ed6:
@@ -8523,7 +8525,7 @@
                                                               {
                                                                 #30e4876a: {
                                                                   #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                   #ea1a680e:
                                                                     true
                                                                 },
@@ -8535,7 +8537,7 @@
                                                                   #c709e154:
                                                                     <#c6dba908>,
                                                                   #ec05e4a8:
-                                                                    329,
+                                                                    331,
                                                                   #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "self",
@@ -8545,7 +8547,7 @@
                                                                   },
                                                                   #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                   }
@@ -8554,7 +8556,7 @@
                                                         ],
                                                         {
                                                           #30e4876a: {
-                                                            #c1127ea9: 126
+                                                            #c1127ea9: 128
                                                           }
                                                         },
                                                         {
@@ -8565,7 +8567,7 @@
                                                 })>
                                           ],
                                           {
-                                            #30e4876a: { #c1127ea9: 205 },
+                                            #30e4876a: { #c1127ea9: 207 },
                                             #0e89e422: <#28055b85>,
                                             #d61caa14: <#f9260501>
                                           },
@@ -8573,7 +8575,7 @@
                                             #c709e154:
                                               <#fac503de: {
                                                  #c709e154: <#f9260501>,
-                                                 #ec05e4a8: 116,
+                                                 #ec05e4a8: 118,
                                                  #c8ff724b: {
                                                    #c8ff724b: "y",
                                                    #2cdb06fb: [
@@ -8585,7 +8587,7 @@
                                           })>,
                                       <#0d679c05:
                                          ({
-                                            #d121c0bd: 349,
+                                            #d121c0bd: 351,
                                             #21793419:
                                               ({ #c68b4ed6: 12 },
                                                { #c68b4ed6: 12 })
@@ -8596,7 +8598,7 @@
                                             #12076e59:
                                               <#0fb8fb71:
                                                  ({
-                                                    #d121c0bd: 350,
+                                                    #d121c0bd: 352,
                                                     #21793419:
                                                       ({ #c68b4ed6: 12 },
                                                        { #c68b4ed6: 12 })
@@ -8618,17 +8620,17 @@
                                     { #c709e154: <#009aba4f> })>,
                                 <#0d679c05:
                                    ({
-                                      #d121c0bd: 346,
+                                      #d121c0bd: 348,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 3 })
                                     },
                                     [],
-                                    { #30e4876a: { #c1127ea9: 126 } },
+                                    { #30e4876a: { #c1127ea9: 128 } },
                                     {
                                       #12076e59:
                                         <#c3b129f9:
                                            ({
-                                              #d121c0bd: 347,
+                                              #d121c0bd: 349,
                                               #21793419:
                                                 ({ #c68b4ed6: 3 },
                                                  { #c68b4ed6: 3 })
@@ -8636,7 +8638,7 @@
                                             [
                                               <#e9db58be:
                                                  ({
-                                                    #d121c0bd: 348,
+                                                    #d121c0bd: 350,
                                                     #21793419:
                                                       ({ #c68b4ed6: 3 },
                                                        { #c68b4ed6: 3 })
@@ -8644,7 +8646,7 @@
                                                   [],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 126,
+                                                      #c1127ea9: 128,
                                                       #ea1a680e: true
                                                     },
                                                     #0e89e422: <#28055b85>
@@ -8652,19 +8654,19 @@
                                                   {
                                                     #c369ebbe: {
                                                       #c709e154: <#c6dba908>,
-                                                      #ec05e4a8: 329,
+                                                      #ec05e4a8: 331,
                                                       #c8ff724b: {
                                                         #c8ff724b: "self",
                                                         #2cdb06fb: [ "self" ]
                                                       },
                                                       #30e4876a: {
-                                                        #c1127ea9: 126,
+                                                        #c1127ea9: 128,
                                                         #ea1a680e: true
                                                       }
                                                     }
                                                   })>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 126 } },
+                                            { #30e4876a: { #c1127ea9: 128 } },
                                             {
                                               #c91e0a14: <#f7495e1f>,
                                               #fa1a3bd3: []
@@ -8672,7 +8674,7 @@
                                     })>,
                                 <#0d679c05:
                                    ({
-                                      #d121c0bd: 349,
+                                      #d121c0bd: 351,
                                       #21793419:
                                         ({ #c68b4ed6: 12 }, { #c68b4ed6: 12 })
                                     },
@@ -8682,7 +8684,7 @@
                                       #12076e59:
                                         <#0fb8fb71:
                                            ({
-                                              #d121c0bd: 350,
+                                              #d121c0bd: 352,
                                               #21793419:
                                                 ({ #c68b4ed6: 12 },
                                                  { #c68b4ed6: 12 })
@@ -8697,25 +8699,25 @@
                                     })>,
                                 <#f104c570:
                                    ({
-                                      #d121c0bd: 351,
+                                      #d121c0bd: 353,
                                       #21793419:
                                         ({ #c68b4ed6: 8 }, { #c68b4ed6: 8 })
                                     },
                                     [
                                       <#0d679c05:
                                          ({
-                                            #d121c0bd: 346,
+                                            #d121c0bd: 348,
                                             #21793419:
                                               ({ #c68b4ed6: 3 },
                                                { #c68b4ed6: 3 })
                                           },
                                           [],
-                                          { #30e4876a: { #c1127ea9: 126 } },
+                                          { #30e4876a: { #c1127ea9: 128 } },
                                           {
                                             #12076e59:
                                               <#c3b129f9:
                                                  ({
-                                                    #d121c0bd: 347,
+                                                    #d121c0bd: 349,
                                                     #21793419:
                                                       ({ #c68b4ed6: 3 },
                                                        { #c68b4ed6: 3 })
@@ -8723,7 +8725,7 @@
                                                   [
                                                     <#e9db58be:
                                                        ({
-                                                          #d121c0bd: 348,
+                                                          #d121c0bd: 350,
                                                           #21793419:
                                                             ({ #c68b4ed6: 3 },
                                                              { #c68b4ed6: 3 })
@@ -8731,7 +8733,7 @@
                                                         [],
                                                         {
                                                           #30e4876a: {
-                                                            #c1127ea9: 126,
+                                                            #c1127ea9: 128,
                                                             #ea1a680e: true
                                                           },
                                                           #0e89e422:
@@ -8741,7 +8743,7 @@
                                                           #c369ebbe: {
                                                             #c709e154:
                                                               <#c6dba908>,
-                                                            #ec05e4a8: 329,
+                                                            #ec05e4a8: 331,
                                                             #c8ff724b: {
                                                               #c8ff724b:
                                                                 "self",
@@ -8750,7 +8752,7 @@
                                                               ]
                                                             },
                                                             #30e4876a: {
-                                                              #c1127ea9: 126,
+                                                              #c1127ea9: 128,
                                                               #ea1a680e: true
                                                             }
                                                           }
@@ -8758,7 +8760,7 @@
                                                   ],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 126
+                                                      #c1127ea9: 128
                                                     }
                                                   },
                                                   {
@@ -8768,7 +8770,7 @@
                                           })>,
                                       <#0d679c05:
                                          ({
-                                            #d121c0bd: 349,
+                                            #d121c0bd: 351,
                                             #21793419:
                                               ({ #c68b4ed6: 12 },
                                                { #c68b4ed6: 12 })
@@ -8779,7 +8781,7 @@
                                             #12076e59:
                                               <#0fb8fb71:
                                                  ({
-                                                    #d121c0bd: 350,
+                                                    #d121c0bd: 352,
                                                     #21793419:
                                                       ({ #c68b4ed6: 12 },
                                                        { #c68b4ed6: 12 })
@@ -8797,17 +8799,17 @@
                                                   })>
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 101 } },
+                                    { #30e4876a: { #c1127ea9: 103 } },
                                     {
                                       #316d331f: "setY:",
                                       #1ea99a8b: true,
-                                      #ec05e4a8: 319
+                                      #ec05e4a8: 321
                                     })>
                               ],
                               { #30e4876a: { #c1127ea9: 53 } })>,
                           <#26afa8d2:
                              ({
-                                #d121c0bd: 352,
+                                #d121c0bd: 354,
                                 #21793419:
                                   ({ #c7b317f4: 78, #c68b4ed6: 3 },
                                    { #c68b4ed6: 19 })
@@ -8815,14 +8817,14 @@
                               [
                                 <#d49390e5:
                                    ({
-                                      #d121c0bd: 353,
+                                      #d121c0bd: 355,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 19 })
                                     },
                                     [
                                       <#e9c8dd27:
                                          ({
-                                            #d121c0bd: 354,
+                                            #d121c0bd: 356,
                                             #21793419:
                                               ({ #c68b4ed6: 3 },
                                                { #c68b4ed6: 8 })
@@ -8830,7 +8832,7 @@
                                           [
                                             <#0d679c05:
                                                ({
-                                                  #d121c0bd: 355,
+                                                  #d121c0bd: 357,
                                                   #21793419:
                                                     ({ #c68b4ed6: 3 },
                                                      { #c68b4ed6: 3 })
@@ -8838,14 +8840,14 @@
                                                 [],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 126
+                                                    #c1127ea9: 128
                                                   }
                                                 },
                                                 {
                                                   #12076e59:
                                                     <#c3b129f9:
                                                        ({
-                                                          #d121c0bd: 356,
+                                                          #d121c0bd: 358,
                                                           #21793419:
                                                             ({ #c68b4ed6: 3 },
                                                              { #c68b4ed6: 3 })
@@ -8854,7 +8856,7 @@
                                                           <#e9db58be:
                                                              ({
                                                                 #d121c0bd:
-                                                                  357,
+                                                                  359,
                                                                 #21793419:
                                                                   ({
                                                                     #c68b4ed6:
@@ -8869,7 +8871,7 @@
                                                               {
                                                                 #30e4876a: {
                                                                   #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                   #ea1a680e:
                                                                     true
                                                                 },
@@ -8881,7 +8883,7 @@
                                                                   #c709e154:
                                                                     <#c6dba908>,
                                                                   #ec05e4a8:
-                                                                    329,
+                                                                    331,
                                                                   #c8ff724b: {
                                                                     #c8ff724b:
                                                                     "self",
@@ -8891,7 +8893,7 @@
                                                                   },
                                                                   #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126,
+                                                                    128,
                                                                     #ea1a680e:
                                                                     true
                                                                   }
@@ -8900,7 +8902,7 @@
                                                         ],
                                                         {
                                                           #30e4876a: {
-                                                            #c1127ea9: 126
+                                                            #c1127ea9: 128
                                                           }
                                                         },
                                                         {
@@ -8911,7 +8913,7 @@
                                                 })>
                                           ],
                                           {
-                                            #30e4876a: { #c1127ea9: 205 },
+                                            #30e4876a: { #c1127ea9: 207 },
                                             #0e89e422: <#28055b85>,
                                             #d61caa14: <#f9260501>
                                           },
@@ -8919,7 +8921,7 @@
                                             #c709e154:
                                               <#fac503de: {
                                                  #c709e154: <#f9260501>,
-                                                 #ec05e4a8: 120,
+                                                 #ec05e4a8: 122,
                                                  #c8ff724b: {
                                                    #c8ff724b: "delegate",
                                                    #2cdb06fb: [
@@ -8931,7 +8933,7 @@
                                           })>,
                                       <#0d679c05:
                                          ({
-                                            #d121c0bd: 358,
+                                            #d121c0bd: 360,
                                             #21793419:
                                               ({ #c68b4ed6: 19 },
                                                { #c68b4ed6: 19 })
@@ -8942,7 +8944,7 @@
                                             #12076e59:
                                               <#02335a3f:
                                                  ({
-                                                    #d121c0bd: 359,
+                                                    #d121c0bd: 361,
                                                     #21793419:
                                                       ({ #c68b4ed6: 19 },
                                                        { #c68b4ed6: 19 })
@@ -8950,7 +8952,7 @@
                                                   [
                                                     <#ca9fafa2:
                                                        ({
-                                                          #d121c0bd: 360,
+                                                          #d121c0bd: 362,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 19
@@ -8963,7 +8965,7 @@
                                                           <#0fb8fb71:
                                                              ({
                                                                 #d121c0bd:
-                                                                  361,
+                                                                  363,
                                                                 #21793419:
                                                                   ({
                                                                     #c68b4ed6:
@@ -9012,17 +9014,17 @@
                                     { #c709e154: <#009aba4f> })>,
                                 <#0d679c05:
                                    ({
-                                      #d121c0bd: 355,
+                                      #d121c0bd: 357,
                                       #21793419:
                                         ({ #c68b4ed6: 3 }, { #c68b4ed6: 3 })
                                     },
                                     [],
-                                    { #30e4876a: { #c1127ea9: 126 } },
+                                    { #30e4876a: { #c1127ea9: 128 } },
                                     {
                                       #12076e59:
                                         <#c3b129f9:
                                            ({
-                                              #d121c0bd: 356,
+                                              #d121c0bd: 358,
                                               #21793419:
                                                 ({ #c68b4ed6: 3 },
                                                  { #c68b4ed6: 3 })
@@ -9030,7 +9032,7 @@
                                             [
                                               <#e9db58be:
                                                  ({
-                                                    #d121c0bd: 357,
+                                                    #d121c0bd: 359,
                                                     #21793419:
                                                       ({ #c68b4ed6: 3 },
                                                        { #c68b4ed6: 3 })
@@ -9038,7 +9040,7 @@
                                                   [],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 126,
+                                                      #c1127ea9: 128,
                                                       #ea1a680e: true
                                                     },
                                                     #0e89e422: <#28055b85>
@@ -9046,19 +9048,19 @@
                                                   {
                                                     #c369ebbe: {
                                                       #c709e154: <#c6dba908>,
-                                                      #ec05e4a8: 329,
+                                                      #ec05e4a8: 331,
                                                       #c8ff724b: {
                                                         #c8ff724b: "self",
                                                         #2cdb06fb: [ "self" ]
                                                       },
                                                       #30e4876a: {
-                                                        #c1127ea9: 126,
+                                                        #c1127ea9: 128,
                                                         #ea1a680e: true
                                                       }
                                                     }
                                                   })>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 126 } },
+                                            { #30e4876a: { #c1127ea9: 128 } },
                                             {
                                               #c91e0a14: <#f7495e1f>,
                                               #fa1a3bd3: []
@@ -9066,7 +9068,7 @@
                                     })>,
                                 <#0d679c05:
                                    ({
-                                      #d121c0bd: 358,
+                                      #d121c0bd: 360,
                                       #21793419:
                                         ({ #c68b4ed6: 19 }, { #c68b4ed6: 19 })
                                     },
@@ -9076,7 +9078,7 @@
                                       #12076e59:
                                         <#02335a3f:
                                            ({
-                                              #d121c0bd: 359,
+                                              #d121c0bd: 361,
                                               #21793419:
                                                 ({ #c68b4ed6: 19 },
                                                  { #c68b4ed6: 19 })
@@ -9084,7 +9086,7 @@
                                             [
                                               <#ca9fafa2:
                                                  ({
-                                                    #d121c0bd: 360,
+                                                    #d121c0bd: 362,
                                                     #21793419:
                                                       ({ #c68b4ed6: 19 },
                                                        { #c68b4ed6: 19 })
@@ -9092,7 +9094,7 @@
                                                   [
                                                     <#0fb8fb71:
                                                        ({
-                                                          #d121c0bd: 361,
+                                                          #d121c0bd: 363,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 19
@@ -9128,17 +9130,17 @@
                                     })>,
                                 <#0d679c05:
                                    ({
-                                      #d121c0bd: 362,
+                                      #d121c0bd: 364,
                                       #21793419:
                                         ({ #c68b4ed6: 19 }, { #c68b4ed6: 19 })
                                     },
                                     [],
-                                    { #30e4876a: { #c1127ea9: 121 } },
+                                    { #30e4876a: { #c1127ea9: 123 } },
                                     {
                                       #12076e59:
                                         <#c3b129f9:
                                            ({
-                                              #d121c0bd: 363,
+                                              #d121c0bd: 365,
                                               #21793419:
                                                 ({ #c68b4ed6: 19 },
                                                  { #c68b4ed6: 19 })
@@ -9146,7 +9148,7 @@
                                             [
                                               <#0d679c05:
                                                  ({
-                                                    #d121c0bd: 358,
+                                                    #d121c0bd: 360,
                                                     #21793419:
                                                       ({ #c68b4ed6: 19 },
                                                        { #c68b4ed6: 19 })
@@ -9161,7 +9163,7 @@
                                                     #12076e59:
                                                       <#02335a3f:
                                                          ({
-                                                            #d121c0bd: 359,
+                                                            #d121c0bd: 361,
                                                             #21793419:
                                                               ({
                                                                  #c68b4ed6:
@@ -9176,7 +9178,7 @@
                                                             <#ca9fafa2:
                                                                ({
                                                                   #d121c0bd:
-                                                                    360,
+                                                                    362,
                                                                   #21793419:
                                                                     (
                                                                   {
@@ -9193,7 +9195,7 @@
                                                                     (
                                                                    {
                                                                     #d121c0bd:
-                                                                    361,
+                                                                    363,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -9245,7 +9247,7 @@
                                                           })>
                                                   })>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 121 } },
+                                            { #30e4876a: { #c1127ea9: 123 } },
                                             {
                                               #c91e0a14: <#2b10160c>,
                                               #fa1a3bd3: []
@@ -9253,25 +9255,25 @@
                                     })>,
                                 <#f104c570:
                                    ({
-                                      #d121c0bd: 364,
+                                      #d121c0bd: 366,
                                       #21793419:
                                         ({ #c68b4ed6: 8 }, { #c68b4ed6: 8 })
                                     },
                                     [
                                       <#0d679c05:
                                          ({
-                                            #d121c0bd: 355,
+                                            #d121c0bd: 357,
                                             #21793419:
                                               ({ #c68b4ed6: 3 },
                                                { #c68b4ed6: 3 })
                                           },
                                           [],
-                                          { #30e4876a: { #c1127ea9: 126 } },
+                                          { #30e4876a: { #c1127ea9: 128 } },
                                           {
                                             #12076e59:
                                               <#c3b129f9:
                                                  ({
-                                                    #d121c0bd: 356,
+                                                    #d121c0bd: 358,
                                                     #21793419:
                                                       ({ #c68b4ed6: 3 },
                                                        { #c68b4ed6: 3 })
@@ -9279,7 +9281,7 @@
                                                   [
                                                     <#e9db58be:
                                                        ({
-                                                          #d121c0bd: 357,
+                                                          #d121c0bd: 359,
                                                           #21793419:
                                                             ({ #c68b4ed6: 3 },
                                                              { #c68b4ed6: 3 })
@@ -9287,7 +9289,7 @@
                                                         [],
                                                         {
                                                           #30e4876a: {
-                                                            #c1127ea9: 126,
+                                                            #c1127ea9: 128,
                                                             #ea1a680e: true
                                                           },
                                                           #0e89e422:
@@ -9297,7 +9299,7 @@
                                                           #c369ebbe: {
                                                             #c709e154:
                                                               <#c6dba908>,
-                                                            #ec05e4a8: 329,
+                                                            #ec05e4a8: 331,
                                                             #c8ff724b: {
                                                               #c8ff724b:
                                                                 "self",
@@ -9306,7 +9308,7 @@
                                                               ]
                                                             },
                                                             #30e4876a: {
-                                                              #c1127ea9: 126,
+                                                              #c1127ea9: 128,
                                                               #ea1a680e: true
                                                             }
                                                           }
@@ -9314,7 +9316,7 @@
                                                   ],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 126
+                                                      #c1127ea9: 128
                                                     }
                                                   },
                                                   {
@@ -9324,18 +9326,18 @@
                                           })>,
                                       <#0d679c05:
                                          ({
-                                            #d121c0bd: 362,
+                                            #d121c0bd: 364,
                                             #21793419:
                                               ({ #c68b4ed6: 19 },
                                                { #c68b4ed6: 19 })
                                           },
                                           [],
-                                          { #30e4876a: { #c1127ea9: 121 } },
+                                          { #30e4876a: { #c1127ea9: 123 } },
                                           {
                                             #12076e59:
                                               <#c3b129f9:
                                                  ({
-                                                    #d121c0bd: 363,
+                                                    #d121c0bd: 365,
                                                     #21793419:
                                                       ({ #c68b4ed6: 19 },
                                                        { #c68b4ed6: 19 })
@@ -9343,7 +9345,7 @@
                                                   [
                                                     <#0d679c05:
                                                        ({
-                                                          #d121c0bd: 358,
+                                                          #d121c0bd: 360,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 19
@@ -9363,7 +9365,7 @@
                                                             <#02335a3f:
                                                                ({
                                                                   #d121c0bd:
-                                                                    359,
+                                                                    361,
                                                                   #21793419:
                                                                     (
                                                                   {
@@ -9380,7 +9382,7 @@
                                                                     (
                                                                    {
                                                                     #d121c0bd:
-                                                                    360,
+                                                                    362,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -9396,7 +9398,7 @@
                                                                     <#0fb8fb71:
                                                                     ({
                                                                     #d121c0bd:
-                                                                    361,
+                                                                    363,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -9451,7 +9453,7 @@
                                                   ],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 121
+                                                      #c1127ea9: 123
                                                     }
                                                   },
                                                   {
@@ -9460,14 +9462,14 @@
                                                   })>
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 101 } },
+                                    { #30e4876a: { #c1127ea9: 103 } },
                                     {
                                       #316d331f: "setDelegate:",
                                       #1ea99a8b: true,
-                                      #ec05e4a8: 321
+                                      #ec05e4a8: 323
                                     })>
                               ],
-                              { #30e4876a: { #c1127ea9: 121 } })>
+                              { #30e4876a: { #c1127ea9: 123 } })>
                         ])>,
                   #d2e9b40c: "-[MyClass(MyCategory) bar:]"
                 })>
@@ -9476,12 +9478,12 @@
           {
             #2ec29bb2: {
               #c709e154: <#3cf18b8d>,
-              #ec05e4a8: 106,
+              #ec05e4a8: 108,
               #c8ff724b: { #c8ff724b: "MyClass", #2cdb06fb: [ "MyClass" ] }
             },
             #2c58a88b: {
               #c709e154: <#fa59e7aa>,
-              #ec05e4a8: 147,
+              #ec05e4a8: 149,
               #c8ff724b: {
                 #c8ff724b: "MyCategory",
                 #2cdb06fb: [ "MyCategory" ]
@@ -9490,7 +9492,7 @@
           })>,
       <#18d25297:
          ({
-            #d121c0bd: 365,
+            #d121c0bd: 367,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 83, #c68b4ed6: 1 },
@@ -9508,7 +9510,7 @@
           })>,
       <#18d25297:
          ({
-            #d121c0bd: 366,
+            #d121c0bd: 368,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 87, #c68b4ed6: 1 },
@@ -9518,12 +9520,12 @@
           [
             <#3ccd3797:
                ({
-                  #d121c0bd: 367,
-                  #f9005968: 366,
+                  #d121c0bd: 369,
+                  #f9005968: 368,
                   #21793419:
                     ({ #c7b317f4: 88, #c68b4ed6: 1 }, { #c68b4ed6: 60 }),
                   #1771a8d7: [
-                    <#d394bbd3: ({ #d121c0bd: 368, #21793419: ({ }, { }) })>
+                    <#d394bbd3: ({ #d121c0bd: 370, #21793419: ({ }, { }) })>
                   ]
                 },
                 {
@@ -9535,17 +9537,17 @@
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 369,
+                          #d121c0bd: 371,
                           #21793419: ({ #c68b4ed6: 28 }, { #c68b4ed6: 58 })
                         },
                         { #c8ff724b: "Cs", #2cdb06fb: [ "Cs" ] },
-                        { #c1127ea9: 370 },
+                        { #c1127ea9: 372 },
                         { #0370b1b2: 0 })>
                   ],
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 371,
+                          #d121c0bd: 373,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -9554,7 +9556,7 @@
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 372,
+                          #d121c0bd: 374,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -9575,7 +9577,7 @@
           })>,
       <#18d25297:
          ({
-            #d121c0bd: 373,
+            #d121c0bd: 375,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 91, #c68b4ed6: 1 },
@@ -9587,12 +9589,12 @@
           {
             #04c0017b: {
               #c709e154: <#3cf18b8d>,
-              #ec05e4a8: 106,
+              #ec05e4a8: 108,
               #c8ff724b: { #c8ff724b: "MyClass", #2cdb06fb: [ "MyClass" ] }
             },
             #d32dd232: {
               #c709e154: <#c37c57de>,
-              #ec05e4a8: 374,
+              #ec05e4a8: 376,
               #c8ff724b: {
                 #c8ff724b: "MySubclass",
                 #2cdb06fb: [ "MySubclass" ]
@@ -9601,7 +9603,7 @@
           })>,
       <#0e281b68:
          ({
-            #d121c0bd: 374,
+            #d121c0bd: 376,
             #f9005968: 1,
             #21793419:
               ({ #c7b317f4: 94, #c68b4ed6: 1 },
@@ -9611,8 +9613,8 @@
           [
             <#3ccd3797:
                ({
-                  #d121c0bd: 375,
-                  #f9005968: 374,
+                  #d121c0bd: 377,
+                  #f9005968: 376,
                   #21793419:
                     ({ #c7b317f4: 96, #c68b4ed6: 1 },
                      { #c7b317f4: 98, #c68b4ed6: 1 })
@@ -9620,11 +9622,11 @@
                 { #c8ff724b: "bar:", #2cdb06fb: [ "bar:", "MySubclass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 376,
+                          #d121c0bd: 378,
                           #21793419:
                             ({ #c7b317f4: 96, #c68b4ed6: 14 },
                              { #c68b4ed6: 25 }),
@@ -9638,16 +9640,16 @@
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 377,
+                          #d121c0bd: 379,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 378, #ea1a680e: true },
+                        { #c1127ea9: 380, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 379,
+                          #d121c0bd: 381,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -9659,7 +9661,7 @@
                   #c11b7aa2:
                     <#d394bb73:
                        ({
-                          #d121c0bd: 380,
+                          #d121c0bd: 382,
                           #21793419:
                             ({ #c68b4ed6: 27 },
                              { #c7b317f4: 98, #c68b4ed6: 1 })
@@ -9667,7 +9669,7 @@
                         [
                           <#f104c570:
                              ({
-                                #d121c0bd: 381,
+                                #d121c0bd: 383,
                                 #21793419:
                                   ({ #c7b317f4: 97, #c68b4ed6: 3 },
                                    { #c68b4ed6: 15 })
@@ -9675,14 +9677,14 @@
                               [
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 382,
+                                      #d121c0bd: 384,
                                       #21793419:
                                         ({ #c68b4ed6: 14 }, { #c68b4ed6: 14 })
                                     },
                                     [
                                       <#e9db58be:
                                          ({
-                                            #d121c0bd: 383,
+                                            #d121c0bd: 385,
                                             #21793419:
                                               ({ #c68b4ed6: 14 },
                                                { #c68b4ed6: 14 })
@@ -9695,7 +9697,7 @@
                                           {
                                             #c369ebbe: {
                                               #c709e154: <#334f163b>,
-                                              #ec05e4a8: 376,
+                                              #ec05e4a8: 378,
                                               #c8ff724b: {
                                                 #c8ff724b: "s",
                                                 #2cdb06fb: [ "s" ]
@@ -9707,11 +9709,11 @@
                                     { #30e4876a: { #c1127ea9: 59 } },
                                     { #c91e0a14: <#f7495e1f>, #fa1a3bd3: [] })>
                               ],
-                              { #30e4876a: { #c1127ea9: 101 } },
+                              { #30e4876a: { #c1127ea9: 103 } },
                               {
                                 #316d331f: "bar:",
                                 #1ea99a8b: true,
-                                #ec05e4a8: 327,
+                                #ec05e4a8: 329,
                                 #0ca98da4: <#0ba9a010>
                               })>
                         ])>,
@@ -9719,8 +9721,8 @@
                 })>,
             <#3ccd3797:
                ({
-                  #d121c0bd: 384,
-                  #f9005968: 374,
+                  #d121c0bd: 386,
+                  #f9005968: 376,
                   #21793419:
                     ({ #c7b317f4: 100, #c68b4ed6: 1 },
                      { #c7b317f4: 102, #c68b4ed6: 1 })
@@ -9728,11 +9730,11 @@
                 { #c8ff724b: "foo:", #2cdb06fb: [ "foo:", "MySubclass" ] },
                 {
                   #3ba2c7f6: true,
-                  #137b649c: { #c1127ea9: 101 },
+                  #137b649c: { #c1127ea9: 103 },
                   #d17ebeaa: [
                     <#fd75cc45:
                        ({
-                          #d121c0bd: 385,
+                          #d121c0bd: 387,
                           #21793419:
                             ({ #c7b317f4: 100, #c68b4ed6: 14 },
                              { #c68b4ed6: 34 }),
@@ -9740,22 +9742,22 @@
                           #d3368c8a: true
                         },
                         { #c8ff724b: "s", #2cdb06fb: [ "s" ] },
-                        { #c1127ea9: 151 },
+                        { #c1127ea9: 153 },
                         { #0370b1b2: 0 })>
                   ],
                   #28dcb2c4: [
                     <#d0d84992:
                        ({
-                          #d121c0bd: 386,
+                          #d121c0bd: 388,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
                         { #c8ff724b: "self", #2cdb06fb: [ "self" ] },
-                        { #c1127ea9: 378, #ea1a680e: true },
+                        { #c1127ea9: 380, #ea1a680e: true },
                         { })>,
                     <#d0d84992:
                        ({
-                          #d121c0bd: 387,
+                          #d121c0bd: 389,
                           #21793419: ({ }, { }),
                           #eb8a1f5a: true
                         },
@@ -9767,7 +9769,7 @@
                   #c11b7aa2:
                     <#d394bb73:
                        ({
-                          #d121c0bd: 388,
+                          #d121c0bd: 390,
                           #21793419:
                             ({ #c68b4ed6: 36 },
                              { #c7b317f4: 102, #c68b4ed6: 1 })
@@ -9775,7 +9777,7 @@
                         [
                           <#f104c570:
                              ({
-                                #d121c0bd: 389,
+                                #d121c0bd: 391,
                                 #21793419:
                                   ({ #c7b317f4: 101, #c68b4ed6: 3 },
                                    { #c68b4ed6: 15 })
@@ -9783,43 +9785,43 @@
                               [
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 390,
+                                      #d121c0bd: 392,
                                       #21793419:
                                         ({ #c68b4ed6: 14 }, { #c68b4ed6: 14 })
                                     },
                                     [
                                       <#e9db58be:
                                          ({
-                                            #d121c0bd: 391,
+                                            #d121c0bd: 393,
                                             #21793419:
                                               ({ #c68b4ed6: 14 },
                                                { #c68b4ed6: 14 })
                                           },
                                           [],
                                           {
-                                            #30e4876a: { #c1127ea9: 151 },
+                                            #30e4876a: { #c1127ea9: 153 },
                                             #0e89e422: <#28055b85>
                                           },
                                           {
                                             #c369ebbe: {
                                               #c709e154: <#334f163b>,
-                                              #ec05e4a8: 385,
+                                              #ec05e4a8: 387,
                                               #c8ff724b: {
                                                 #c8ff724b: "s",
                                                 #2cdb06fb: [ "s" ]
                                               },
-                                              #30e4876a: { #c1127ea9: 151 }
+                                              #30e4876a: { #c1127ea9: 153 }
                                             }
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 151 } },
+                                    { #30e4876a: { #c1127ea9: 153 } },
                                     { #c91e0a14: <#f7495e1f>, #fa1a3bd3: [] })>
                               ],
-                              { #30e4876a: { #c1127ea9: 101 } },
+                              { #30e4876a: { #c1127ea9: 103 } },
                               {
                                 #316d331f: "foo:",
                                 #1ea99a8b: true,
-                                #ec05e4a8: 154,
+                                #ec05e4a8: 156,
                                 #0ca98da4: <#0ba9a010>
                               })>
                         ])>,
@@ -9830,7 +9832,7 @@
           {
             #2ec29bb2: {
               #c709e154: <#3cf18b8d>,
-              #ec05e4a8: 373,
+              #ec05e4a8: 375,
               #c8ff724b: {
                 #c8ff724b: "MySubclass",
                 #2cdb06fb: [ "MySubclass" ]
@@ -9839,18 +9841,18 @@
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 392,
+            #d121c0bd: 394,
             #21793419:
               ({ #c7b317f4: 106, #c68b4ed6: 1 },
                { #c7b317f4: 112, #c68b4ed6: 1 })
           },
           { #c8ff724b: "main", #2cdb06fb: [ "main" ] },
-          { #c1127ea9: 393 },
+          { #c1127ea9: 395 },
           {
             #d17ebeaa: [
               <#fd75cc45:
                  ({
-                    #d121c0bd: 394,
+                    #d121c0bd: 396,
                     #21793419:
                       ({ #c7b317f4: 106, #c68b4ed6: 10 }, { #c68b4ed6: 14 })
                   },
@@ -9859,25 +9861,25 @@
                   { #0370b1b2: 0 })>,
               <#fd75cc45:
                  ({
-                    #d121c0bd: 395,
+                    #d121c0bd: 397,
                     #21793419: ({ #c68b4ed6: 20 }, { #c68b4ed6: 27 })
                   },
                   { #c8ff724b: "argv", #2cdb06fb: [ "argv" ] },
-                  { #c1127ea9: 396 },
+                  { #c1127ea9: 398 },
                   { #0370b1b2: 1 })>
             ],
-            #ebe3c415: 392,
+            #ebe3c415: 394,
             #c11b7aa2:
               <#d394bb73:
                  ({
-                    #d121c0bd: 397,
+                    #d121c0bd: 399,
                     #21793419:
                       ({ #c68b4ed6: 33 }, { #c7b317f4: 112, #c68b4ed6: 1 })
                   },
                   [
                     <#1a1d5a70:
                        ({
-                          #d121c0bd: 398,
+                          #d121c0bd: 400,
                           #21793419:
                             ({ #c7b317f4: 107, #c68b4ed6: 3 },
                              { #c7b317f4: 110, #c68b4ed6: 3 })
@@ -9885,7 +9887,7 @@
                         [
                           <#d394bb73:
                              ({
-                                #d121c0bd: 399,
+                                #d121c0bd: 401,
                                 #21793419:
                                   ({ #c7b317f4: 107, #c68b4ed6: 20 },
                                    { #c7b317f4: 110, #c68b4ed6: 3 })
@@ -9893,7 +9895,7 @@
                               [
                                 <#d0cddcea:
                                    ({
-                                      #d121c0bd: 400,
+                                      #d121c0bd: 402,
                                       #21793419:
                                         ({ #c7b317f4: 108, #c68b4ed6: 5 },
                                          { #c68b4ed6: 41 })
@@ -9901,7 +9903,7 @@
                                     [
                                       <#f104c570:
                                          ({
-                                            #d121c0bd: 401,
+                                            #d121c0bd: 403,
                                             #21793419:
                                               ({ #c68b4ed6: 5 },
                                                { #c68b4ed6: 41 })
@@ -9909,7 +9911,7 @@
                                           [
                                             <#c3b129f9:
                                                ({
-                                                  #d121c0bd: 402,
+                                                  #d121c0bd: 404,
                                                   #21793419:
                                                     ({ #c68b4ed6: 6 },
                                                      { #c68b4ed6: 27 })
@@ -9917,7 +9919,7 @@
                                                 [
                                                   <#f104c570:
                                                      ({
-                                                        #d121c0bd: 403,
+                                                        #d121c0bd: 405,
                                                         #21793419:
                                                           ({ #c68b4ed6: 6 },
                                                            { #c68b4ed6: 27 })
@@ -9925,7 +9927,7 @@
                                                       [
                                                         <#c3b129f9:
                                                            ({
-                                                              #d121c0bd: 404,
+                                                              #d121c0bd: 406,
                                                               #21793419:
                                                                 ({
                                                                    #c68b4ed6:
@@ -9940,7 +9942,7 @@
                                                               <#f104c570:
                                                                  ({
                                                                     #d121c0bd:
-                                                                    405,
+                                                                    407,
                                                                     #21793419:
                                                                     (
                                                                     {
@@ -9956,7 +9958,7 @@
                                                                   {
                                                                     #30e4876a: {
                                                                     #c1127ea9:
-                                                                    126
+                                                                    128
                                                                     }
                                                                   },
                                                                   {
@@ -9968,14 +9970,14 @@
                                                                     <
                                                                     #db85e818: {
                                                                     #c1127ea9:
-                                                                    406
+                                                                    408
                                                                     }>
                                                                   })>
                                                             ],
                                                             {
                                                               #30e4876a: {
                                                                 #c1127ea9:
-                                                                  126
+                                                                  128
                                                               }
                                                             },
                                                             {
@@ -9986,7 +9988,7 @@
                                                       ],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 126
+                                                          #c1127ea9: 128
                                                         }
                                                       },
                                                       {
@@ -9996,7 +9998,7 @@
                                                 ],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 126
+                                                    #c1127ea9: 128
                                                   }
                                                 },
                                                 {
@@ -10005,7 +10007,7 @@
                                                 })>,
                                             <#ff6ba872:
                                                ({
-                                                  #d121c0bd: 407,
+                                                  #d121c0bd: 409,
                                                   #21793419:
                                                     ({ #c68b4ed6: 33 },
                                                      { #c68b4ed6: 34 })
@@ -10013,7 +10015,7 @@
                                                 [
                                                   <#3231247e:
                                                      ({
-                                                        #d121c0bd: 408,
+                                                        #d121c0bd: 410,
                                                         #21793419:
                                                           ({ #c68b4ed6: 34 },
                                                            { #c68b4ed6: 34 })
@@ -10021,7 +10023,7 @@
                                                       [],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 409
+                                                          #c1127ea9: 411
                                                         },
                                                         #0e89e422:
                                                           <#28055b85>
@@ -10034,18 +10036,18 @@
                                                   }
                                                 })>
                                           ],
-                                          { #30e4876a: { #c1127ea9: 101 } },
+                                          { #30e4876a: { #c1127ea9: 103 } },
                                           {
                                             #316d331f: "foo:",
                                             #1ea99a8b: true,
-                                            #ec05e4a8: 154
+                                            #ec05e4a8: 156
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 101 } },
+                                    { #30e4876a: { #c1127ea9: 103 } },
                                     { })>,
                                 <#d0cddcea:
                                    ({
-                                      #d121c0bd: 410,
+                                      #d121c0bd: 412,
                                       #21793419:
                                         ({ #c7b317f4: 109, #c68b4ed6: 5 },
                                          { #c68b4ed6: 32 })
@@ -10053,7 +10055,7 @@
                                     [
                                       <#f104c570:
                                          ({
-                                            #d121c0bd: 411,
+                                            #d121c0bd: 413,
                                             #21793419:
                                               ({ #c68b4ed6: 5 },
                                                { #c68b4ed6: 32 })
@@ -10061,7 +10063,7 @@
                                           [
                                             <#c3b129f9:
                                                ({
-                                                  #d121c0bd: 412,
+                                                  #d121c0bd: 414,
                                                   #21793419:
                                                     ({ #c68b4ed6: 6 },
                                                      { #c68b4ed6: 18 })
@@ -10069,7 +10071,7 @@
                                                 [
                                                   <#f104c570:
                                                      ({
-                                                        #d121c0bd: 413,
+                                                        #d121c0bd: 415,
                                                         #21793419:
                                                           ({ #c68b4ed6: 6 },
                                                            { #c68b4ed6: 18 })
@@ -10077,7 +10079,7 @@
                                                       [],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 126
+                                                          #c1127ea9: 128
                                                         }
                                                       },
                                                       {
@@ -10085,13 +10087,13 @@
                                                         #ec05e4a8: 24,
                                                         #0ca98da4:
                                                           <#db85e818: {
-                                                             #c1127ea9: 406
+                                                             #c1127ea9: 408
                                                            }>
                                                       })>
                                                 ],
                                                 {
                                                   #30e4876a: {
-                                                    #c1127ea9: 126
+                                                    #c1127ea9: 128
                                                   }
                                                 },
                                                 {
@@ -10100,7 +10102,7 @@
                                                 })>,
                                             <#ff6ba872:
                                                ({
-                                                  #d121c0bd: 414,
+                                                  #d121c0bd: 416,
                                                   #21793419:
                                                     ({ #c68b4ed6: 24 },
                                                      { #c68b4ed6: 25 })
@@ -10108,7 +10110,7 @@
                                                 [
                                                   <#3231247e:
                                                      ({
-                                                        #d121c0bd: 415,
+                                                        #d121c0bd: 417,
                                                         #21793419:
                                                           ({ #c68b4ed6: 25 },
                                                            { #c68b4ed6: 25 })
@@ -10116,7 +10118,7 @@
                                                       [],
                                                       {
                                                         #30e4876a: {
-                                                          #c1127ea9: 409
+                                                          #c1127ea9: 411
                                                         },
                                                         #0e89e422:
                                                           <#28055b85>
@@ -10129,20 +10131,20 @@
                                                   }
                                                 })>
                                           ],
-                                          { #30e4876a: { #c1127ea9: 101 } },
+                                          { #30e4876a: { #c1127ea9: 103 } },
                                           {
                                             #316d331f: "bar:",
                                             #1ea99a8b: true,
-                                            #ec05e4a8: 327
+                                            #ec05e4a8: 329
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 101 } },
+                                    { #30e4876a: { #c1127ea9: 103 } },
                                     { })>
                               ])>
                         ])>,
                     <#df3bdb38:
                        ({
-                          #d121c0bd: 416,
+                          #d121c0bd: 418,
                           #21793419:
                             ({ #c7b317f4: 111, #c68b4ed6: 3 },
                              { #c68b4ed6: 10 })
@@ -10150,7 +10152,7 @@
                         [
                           <#0fb8fb71:
                              ({
-                                #d121c0bd: 417,
+                                #d121c0bd: 419,
                                 #21793419:
                                   ({ #c68b4ed6: 10 }, { #c68b4ed6: 10 })
                               },
@@ -10165,7 +10167,7 @@
                   ])>
           })>,
       <#0f3f4d35:
-         ({ #d121c0bd: 418, #21793419: ({ }, { }), #eb8a1f5a: true },
+         ({ #d121c0bd: 420, #21793419: ({ }, { }), #eb8a1f5a: true },
           { #c8ff724b: "instancetype", #2cdb06fb: [ "instancetype" ] },
           21,
           { })>
@@ -10183,213 +10185,214 @@
       },
       #247f0baa: true,
       #1acb7079: [
-        <#22d546dd: ({ #d121c0bd: 101 }, <#392cef74>)>,
-        <#22d546dd: ({ #d121c0bd: 419 }, <#2bf4b04a>)>,
-        <#22d546dd: ({ #d121c0bd: 420 }, <#ec0a078a>)>,
-        <#22d546dd: ({ #d121c0bd: 421 }, <#f6dab0c9>)>,
-        <#22d546dd: ({ #d121c0bd: 422 }, <#0f54f45c>)>,
+        <#22d546dd: ({ #d121c0bd: 103 }, <#392cef74>)>,
+        <#22d546dd: ({ #d121c0bd: 421 }, <#2bf4b04a>)>,
+        <#22d546dd: ({ #d121c0bd: 422 }, <#ec0a078a>)>,
+        <#22d546dd: ({ #d121c0bd: 423 }, <#f6dab0c9>)>,
+        <#22d546dd: ({ #d121c0bd: 424 }, <#0f54f45c>)>,
         <#22d546dd: ({ #d121c0bd: 53 }, <#0037c4cf>)>,
-        <#22d546dd: ({ #d121c0bd: 423 }, <#3290d19c>)>,
-        <#22d546dd: ({ #d121c0bd: 424 }, <#fee0a138>)>,
-        <#22d546dd: ({ #d121c0bd: 425 }, <#1da7d9cb>)>,
-        <#22d546dd: ({ #d121c0bd: 426 }, <#0baa9fe7>)>,
+        <#22d546dd: ({ #d121c0bd: 425 }, <#3290d19c>)>,
+        <#22d546dd: ({ #d121c0bd: 426 }, <#fee0a138>)>,
+        <#22d546dd: ({ #d121c0bd: 427 }, <#1da7d9cb>)>,
+        <#22d546dd: ({ #d121c0bd: 428 }, <#0baa9fe7>)>,
         <#22d546dd: ({ #d121c0bd: 79 }, <#3866e79a>)>,
-        <#22d546dd: ({ #d121c0bd: 427 }, <#23a02071>)>,
-        <#22d546dd: ({ #d121c0bd: 428 }, <#09087e8d>)>,
-        <#22d546dd: ({ #d121c0bd: 429 }, <#15c4357c>)>,
-        <#22d546dd: ({ #d121c0bd: 430 }, <#e75f9f31>)>,
-        <#22d546dd: ({ #d121c0bd: 431 }, <#c2f78dcd>)>,
-        <#22d546dd: ({ #d121c0bd: 432 }, <#3726ba3b>)>,
-        <#22d546dd: ({ #d121c0bd: 433 }, <#3759b761>)>,
-        <#22d546dd: ({ #d121c0bd: 434 }, <#ebd317dd>)>,
-        <#22d546dd: ({ #d121c0bd: 435 }, <#2ec759b9>)>,
-        <#22d546dd: ({ #d121c0bd: 436 }, <#284d329d>)>,
-        <#22d546dd: ({ #d121c0bd: 437 }, <#35acb472>)>,
-        <#22d546dd: ({ #d121c0bd: 438 }, <#2b1d0544>)>,
-        <#22d546dd: ({ #d121c0bd: 439 }, <#0106ffa8>)>,
-        <#22d546dd: ({ #d121c0bd: 440 }, <#d6bc9d8a>)>,
-        <#22d546dd: ({ #d121c0bd: 441 }, <#19b0df66>)>,
-        <#22d546dd: ({ #d121c0bd: 442 }, <#1336b84a>)>,
-        <#22d546dd: ({ #d121c0bd: 443 }, <#20963a1f>)>,
-        <#22d546dd: ({ #d121c0bd: 444 }, <#16068af1>)>,
-        <#22d546dd: ({ #d121c0bd: 445 }, <#ebf08555>)>,
-        <#22d546dd: ({ #d121c0bd: 446 }, <#d78ceb63>)>,
-        <#22d546dd: ({ #d121c0bd: 447 }, <#dd2a33f3>)>,
-        <#22d546dd: ({ #d121c0bd: 448 }, <#ef62b1d7>)>,
-        <#22d546dd: ({ #d121c0bd: 449 }, <#0c8bf62c>)>,
-        <#22d546dd: ({ #d121c0bd: 450 }, <#13391dca>)>,
-        <#22d546dd: ({ #d121c0bd: 451 }, <#ecc0d32e>)>,
-        <#22d546dd: ({ #d121c0bd: 452 }, <#c2767110>)>,
-        <#22d546dd: ({ #d121c0bd: 453 }, <#c813b9a0>)>,
-        <#22d546dd: ({ #d121c0bd: 454 }, <#da4c3784>)>,
-        <#22d546dd: ({ #d121c0bd: 455 }, <#f7757bd9>)>,
-        <#22d546dd: ({ #d121c0bd: 456 }, <#fe22a377>)>,
-        <#22d546dd: ({ #d121c0bd: 457 }, <#d7aa58db>)>,
-        <#22d546dd: ({ #d121c0bd: 458 }, <#d2f340c8>)>,
-        <#22d546dd: ({ #d121c0bd: 459 }, <#2193aedd>)>,
-        <#22d546dd: ({ #d121c0bd: 460 }, <#0dd56321>)>,
-        <#22d546dd: ({ #d121c0bd: 461 }, <#d8e10c82>)>,
-        <#22d546dd: ({ #d121c0bd: 462 }, <#c4f079df>)>,
-        <#22d546dd: ({ #d121c0bd: 463 }, <#1ee7219a>)>,
-        <#22d546dd: ({ #d121c0bd: 464 }, <#0d506118>)>,
-        <#22d546dd: ({ #d121c0bd: 205 }, <#dec9bcfd>)>,
-        <#22d546dd: ({ #d121c0bd: 465 }, <#f1f6e5a2>)>,
-        <#22d546dd: ({ #d121c0bd: 466 }, <#d935d0cf>)>,
-        <#22d546dd: ({ #d121c0bd: 467 }, <#d35a4eab>)>,
-        <#2e6cf4ea: ({ #d121c0bd: 468 })>,
-        <#2e6cf4ea: ({ #d121c0bd: 469 })>,
+        <#22d546dd: ({ #d121c0bd: 429 }, <#23a02071>)>,
+        <#22d546dd: ({ #d121c0bd: 430 }, <#09087e8d>)>,
+        <#22d546dd: ({ #d121c0bd: 431 }, <#15c4357c>)>,
+        <#22d546dd: ({ #d121c0bd: 432 }, <#e75f9f31>)>,
+        <#22d546dd: ({ #d121c0bd: 433 }, <#c2f78dcd>)>,
+        <#22d546dd: ({ #d121c0bd: 434 }, <#3726ba3b>)>,
+        <#22d546dd: ({ #d121c0bd: 435 }, <#3759b761>)>,
+        <#22d546dd: ({ #d121c0bd: 436 }, <#ebd317dd>)>,
+        <#22d546dd: ({ #d121c0bd: 437 }, <#2ec759b9>)>,
+        <#22d546dd: ({ #d121c0bd: 438 }, <#284d329d>)>,
+        <#22d546dd: ({ #d121c0bd: 439 }, <#35acb472>)>,
+        <#22d546dd: ({ #d121c0bd: 440 }, <#2b1d0544>)>,
+        <#22d546dd: ({ #d121c0bd: 441 }, <#0106ffa8>)>,
+        <#22d546dd: ({ #d121c0bd: 442 }, <#d6bc9d8a>)>,
+        <#22d546dd: ({ #d121c0bd: 443 }, <#19b0df66>)>,
+        <#22d546dd: ({ #d121c0bd: 444 }, <#1336b84a>)>,
+        <#22d546dd: ({ #d121c0bd: 445 }, <#20963a1f>)>,
+        <#22d546dd: ({ #d121c0bd: 446 }, <#16068af1>)>,
+        <#22d546dd: ({ #d121c0bd: 447 }, <#ebf08555>)>,
+        <#22d546dd: ({ #d121c0bd: 448 }, <#d78ceb63>)>,
+        <#22d546dd: ({ #d121c0bd: 449 }, <#dd2a33f3>)>,
+        <#22d546dd: ({ #d121c0bd: 450 }, <#ef62b1d7>)>,
+        <#22d546dd: ({ #d121c0bd: 451 }, <#0c8bf62c>)>,
+        <#22d546dd: ({ #d121c0bd: 452 }, <#13391dca>)>,
+        <#22d546dd: ({ #d121c0bd: 453 }, <#ecc0d32e>)>,
+        <#22d546dd: ({ #d121c0bd: 454 }, <#c2767110>)>,
+        <#22d546dd: ({ #d121c0bd: 455 }, <#c813b9a0>)>,
+        <#22d546dd: ({ #d121c0bd: 456 }, <#da4c3784>)>,
+        <#22d546dd: ({ #d121c0bd: 457 }, <#f7757bd9>)>,
+        <#22d546dd: ({ #d121c0bd: 458 }, <#fe22a377>)>,
+        <#22d546dd: ({ #d121c0bd: 459 }, <#d7aa58db>)>,
+        <#22d546dd: ({ #d121c0bd: 460 }, <#d2f340c8>)>,
+        <#22d546dd: ({ #d121c0bd: 461 }, <#2193aedd>)>,
+        <#22d546dd: ({ #d121c0bd: 462 }, <#0dd56321>)>,
+        <#22d546dd: ({ #d121c0bd: 463 }, <#d8e10c82>)>,
+        <#22d546dd: ({ #d121c0bd: 464 }, <#c4f079df>)>,
+        <#22d546dd: ({ #d121c0bd: 465 }, <#1ee7219a>)>,
+        <#22d546dd: ({ #d121c0bd: 466 }, <#0d506118>)>,
+        <#22d546dd: ({ #d121c0bd: 207 }, <#dec9bcfd>)>,
+        <#22d546dd: ({ #d121c0bd: 467 }, <#f1f6e5a2>)>,
+        <#22d546dd: ({ #d121c0bd: 468 }, <#d935d0cf>)>,
+        <#22d546dd: ({ #d121c0bd: 469 }, <#d35a4eab>)>,
         <#2e6cf4ea: ({ #d121c0bd: 470 })>,
         <#2e6cf4ea: ({ #d121c0bd: 471 })>,
-        <#22d546dd: ({ #d121c0bd: 472 }, <#c9ba0f87>)>,
-        <#22d546dd: ({ #d121c0bd: 473 }, <#db21580c>)>,
-        <#22d546dd: ({ #d121c0bd: 474 }, <#391b1e6e>)>,
-        <#d3d219f7: ({ #d121c0bd: 112 }, { #c1127ea9: 101 })>,
-        <#22d546dd: ({ #d121c0bd: 475 }, <#ea323187>)>,
-        <#22d546dd: ({ #d121c0bd: 476 }, <#2fe155d3>)>,
-        <#d3d219f7: ({ #d121c0bd: 477 }, { #c1127ea9: 474 })>,
-        <#0098a8c5: ({ #d121c0bd: 478 }, { #fcd148e8: 472 })>,
-        <#2e3d736c: ({ #d121c0bd: 479 }, { #c1127ea9: 478 })>,
-        <#0098a8c5: ({ #d121c0bd: 480 }, { #fcd148e8: 473 })>,
-        <#2e3d736c: ({ #d121c0bd: 481 }, { #c1127ea9: 480 })>,
-        <#2374f4e7: ({ #d121c0bd: 482 }, 10)>,
-        <#d80cb60b: ({ #d121c0bd: 483 }, 484)>,
-        <#d3d219f7: ({ #d121c0bd: 485 }, { #c1127ea9: 53, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 486 }, { #c1127ea9: 420, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 170 }, { #c1127ea9: 420 })>,
-        <#d80cb60b: ({ #d121c0bd: 487 }, 488)>,
+        <#2e6cf4ea: ({ #d121c0bd: 472 })>,
+        <#2e6cf4ea: ({ #d121c0bd: 473 })>,
+        <#22d546dd: ({ #d121c0bd: 474 }, <#c9ba0f87>)>,
+        <#22d546dd: ({ #d121c0bd: 475 }, <#db21580c>)>,
+        <#22d546dd: ({ #d121c0bd: 476 }, <#391b1e6e>)>,
+        <#d3d219f7: ({ #d121c0bd: 114 }, { #c1127ea9: 103 })>,
+        <#22d546dd: ({ #d121c0bd: 477 }, <#ea323187>)>,
+        <#22d546dd: ({ #d121c0bd: 478 }, <#2fe155d3>)>,
+        <#22d546dd: ({ #d121c0bd: 479 }, <#f65b235f>)>,
+        <#d3d219f7: ({ #d121c0bd: 480 }, { #c1127ea9: 476 })>,
+        <#0098a8c5: ({ #d121c0bd: 481 }, { #fcd148e8: 474 })>,
+        <#2e3d736c: ({ #d121c0bd: 482 }, { #c1127ea9: 481 })>,
+        <#0098a8c5: ({ #d121c0bd: 483 }, { #fcd148e8: 475 })>,
+        <#2e3d736c: ({ #d121c0bd: 484 }, { #c1127ea9: 483 })>,
+        <#2374f4e7: ({ #d121c0bd: 485 }, 10)>,
+        <#d80cb60b: ({ #d121c0bd: 486 }, 487)>,
+        <#d3d219f7: ({ #d121c0bd: 488 }, { #c1127ea9: 53, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 489 }, { #c1127ea9: 422, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 172 }, { #c1127ea9: 422 })>,
+        <#d80cb60b: ({ #d121c0bd: 490 }, 491)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 489 },
-            { #cd26765d: { #c1127ea9: 487 }, #11302019: 24 },
+           ({ #d121c0bd: 492 },
+            { #cd26765d: { #c1127ea9: 490 }, #11302019: 24 },
             1)>,
-        <#2374f4e7: ({ #d121c0bd: 490 }, 18)>,
+        <#2374f4e7: ({ #d121c0bd: 493 }, 18)>,
         <#19e1ef85:
-           ({ #d121c0bd: 7, #26f32be5: 479 },
-            { #0b680f7d: { #c1127ea9: 479 }, #c3687459: 6 })>,
+           ({ #d121c0bd: 7, #26f32be5: 482 },
+            { #0b680f7d: { #c1127ea9: 482 }, #c3687459: 6 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 21, #26f32be5: 479 },
-            { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 418 })>,
+           ({ #d121c0bd: 21, #26f32be5: 482 },
+            { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 420 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 9, #26f32be5: 481 },
-            { #0b680f7d: { #c1127ea9: 481 }, #c3687459: 8 })>,
+           ({ #d121c0bd: 9, #26f32be5: 484 },
+            { #0b680f7d: { #c1127ea9: 484 }, #c3687459: 8 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 5, #26f32be5: 477 },
-            { #0b680f7d: { #c1127ea9: 477 }, #c3687459: 4 })>,
-        <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 490 })>,
+           ({ #d121c0bd: 5, #26f32be5: 480 },
+            { #0b680f7d: { #c1127ea9: 480 }, #c3687459: 4 })>,
+        <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 493 })>,
         <#19e1ef85:
            ({ #d121c0bd: 15, #26f32be5: 53 },
             { #0b680f7d: { #c1127ea9: 53 }, #c3687459: 14 })>,
-        <#2e3d736c: ({ #d121c0bd: 47 }, { #c1127ea9: 482 })>,
-        <#2374f4e7: ({ #d121c0bd: 491 }, 50)>,
-        <#2374f4e7: ({ #d121c0bd: 492 }, 56)>,
+        <#2e3d736c: ({ #d121c0bd: 47 }, { #c1127ea9: 485 })>,
+        <#2374f4e7: ({ #d121c0bd: 494 }, 50)>,
+        <#2374f4e7: ({ #d121c0bd: 495 }, 56)>,
         <#19e1ef85:
            ({ #d121c0bd: 17, #26f32be5: 79 },
             { #0b680f7d: { #c1127ea9: 79 }, #c3687459: 16 })>,
-        <#2e3d736c: ({ #d121c0bd: 59 }, { #c1127ea9: 492 })>,
-        <#2374f4e7: ({ #d121c0bd: 493 }, 61)>,
+        <#2e3d736c: ({ #d121c0bd: 59 }, { #c1127ea9: 495 })>,
+        <#2374f4e7: ({ #d121c0bd: 496 }, 61)>,
         <#cd01b755:
-           ({ #d121c0bd: 494 },
-            { #cd26765d: { #c1127ea9: 479 }, #11302019: 8 })>,
+           ({ #d121c0bd: 497 },
+            { #cd26765d: { #c1127ea9: 482 }, #11302019: 8 })>,
         <#cd01b755:
-           ({ #d121c0bd: 495 },
+           ({ #d121c0bd: 498 },
             { #cd26765d: { #c1127ea9: 7, #ea1a680e: true }, #11302019: 8 })>,
         <#cd01b755:
-           ({ #d121c0bd: 496 },
+           ({ #d121c0bd: 499 },
             { #cd26765d: { #c1127ea9: 7, #ea1a680e: true }, #11302019: 8 })>,
-        <#d3d219f7: ({ #d121c0bd: 497 }, { #c1127ea9: 479, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 498 }, { #c1127ea9: 7, #ea1a680e: true })>,
-        <#2d935553: ({ #d121c0bd: 64, #26f32be5: 498 }, { #c1127ea9: 498 })>,
-        <#2e3d736c: ({ #d121c0bd: 72 }, { #c1127ea9: 493 })>,
-        <#2374f4e7: ({ #d121c0bd: 499 }, 74)>,
-        <#d3d219f7: ({ #d121c0bd: 500 }, { #c1127ea9: 479 })>,
+        <#d3d219f7: ({ #d121c0bd: 500 }, { #c1127ea9: 482, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 501 }, { #c1127ea9: 7, #ea1a680e: true })>,
+        <#2d935553: ({ #d121c0bd: 64, #26f32be5: 501 }, { #c1127ea9: 501 })>,
+        <#2e3d736c: ({ #d121c0bd: 72 }, { #c1127ea9: 496 })>,
+        <#2374f4e7: ({ #d121c0bd: 502 }, 74)>,
+        <#d3d219f7: ({ #d121c0bd: 503 }, { #c1127ea9: 482 })>,
         <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 7 })>,
-        <#2e3d736c: ({ #d121c0bd: 85 }, { #c1127ea9: 499 })>,
-        <#2374f4e7: ({ #d121c0bd: 501 }, 87)>,
+        <#2e3d736c: ({ #d121c0bd: 85 }, { #c1127ea9: 502 })>,
+        <#2374f4e7: ({ #d121c0bd: 504 }, 87)>,
         <#26796f6a:
-           ({ #d121c0bd: 502 },
-            { #f9c96be9: { #c1127ea9: 101 } },
+           ({ #d121c0bd: 505 },
+            { #f9c96be9: { #c1127ea9: 103 } },
             { #08ec7593: [ { #c1127ea9: 59 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 503 },
-            { #f9c96be9: { #c1127ea9: 101 } },
+           ({ #d121c0bd: 506 },
+            { #f9c96be9: { #c1127ea9: 103 } },
             { #08ec7593: [ { #c1127ea9: 59 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 504 },
-            { #f9c96be9: { #c1127ea9: 101 } },
-            { #08ec7593: [ { #c1127ea9: 479 } ] })>,
+           ({ #d121c0bd: 507 },
+            { #f9c96be9: { #c1127ea9: 103 } },
+            { #08ec7593: [ { #c1127ea9: 482 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 90 },
-            { #f9c96be9: { #c1127ea9: 101 } },
+           ({ #d121c0bd: 91 },
+            { #f9c96be9: { #c1127ea9: 103 } },
             { #08ec7593: [ { #c1127ea9: 7 } ] })>,
-        <#2374f4e7: ({ #d121c0bd: 406 }, 106)>,
+        <#2374f4e7: ({ #d121c0bd: 408 }, 108)>,
         <#0098a8c5:
-           ({ #d121c0bd: 505 }, { #fcd148e8: 490, #0b037c51: [ 105 ] })>,
-        <#2e3d736c: ({ #d121c0bd: 121 }, { #c1127ea9: 505 })>,
-        <#2e3d736c: ({ #d121c0bd: 126 }, { #c1127ea9: 406 })>,
+           ({ #d121c0bd: 508 }, { #fcd148e8: 493, #0b037c51: [ 107 ] })>,
+        <#2e3d736c: ({ #d121c0bd: 123 }, { #c1127ea9: 508 })>,
+        <#2e3d736c: ({ #d121c0bd: 128 }, { #c1127ea9: 408 })>,
         <#ffc15fc2:
-           ({ #d121c0bd: 151, #26f32be5: 59 }, { #3ed86e62: <#207783bf> })>,
+           ({ #d121c0bd: 153, #26f32be5: 59 }, { #3ed86e62: <#207783bf> })>,
         <#da0c5ecf:
-           ({ #d121c0bd: 166 },
-            { #cd26765d: { #c1127ea9: 420 }, #11302019: 1 },
+           ({ #d121c0bd: 168 },
+            { #cd26765d: { #c1127ea9: 422 }, #11302019: 1 },
             4)>,
-        <#d3d219f7: ({ #d121c0bd: 506 }, { #c1127ea9: 53 })>,
-        <#d3d219f7: ({ #d121c0bd: 169 }, { #c1127ea9: 506 })>,
-        <#d3d219f7: ({ #d121c0bd: 507 }, { #c1127ea9: 504 })>,
-        <#d3d219f7: ({ #d121c0bd: 162 }, { #c1127ea9: 90 })>,
+        <#d3d219f7: ({ #d121c0bd: 509 }, { #c1127ea9: 53 })>,
+        <#d3d219f7: ({ #d121c0bd: 171 }, { #c1127ea9: 509 })>,
+        <#d3d219f7: ({ #d121c0bd: 510 }, { #c1127ea9: 507 })>,
+        <#d3d219f7: ({ #d121c0bd: 164 }, { #c1127ea9: 91 })>,
         <#26796f6a:
-           ({ #d121c0bd: 508 },
+           ({ #d121c0bd: 511 },
             { #f9c96be9: { #c1127ea9: 79 } },
             { #08ec7593: [ { #c1127ea9: 59 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 509 },
+           ({ #d121c0bd: 512 },
             { #f9c96be9: { #c1127ea9: 17 } },
             { #08ec7593: [ { #c1127ea9: 59 } ] })>,
-        <#0c1e4fc4: ({ #d121c0bd: 510, #26f32be5: 509 }, { #c1127ea9: 509 })>,
-        <#e5fe99ea: ({ #d121c0bd: 511 }, { #c1127ea9: 508 })>,
-        <#e5fe99ea: ({ #d121c0bd: 217 }, { #c1127ea9: 510 })>,
+        <#0c1e4fc4: ({ #d121c0bd: 513, #26f32be5: 512 }, { #c1127ea9: 512 })>,
+        <#e5fe99ea: ({ #d121c0bd: 514 }, { #c1127ea9: 511 })>,
+        <#e5fe99ea: ({ #d121c0bd: 219 }, { #c1127ea9: 513 })>,
         <#26796f6a:
-           ({ #d121c0bd: 512 },
-            { #f9c96be9: { #c1127ea9: 462 } },
+           ({ #d121c0bd: 515 },
+            { #f9c96be9: { #c1127ea9: 464 } },
             { #08ec7593: [ { #c1127ea9: 59 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 513 },
-            { #f9c96be9: { #c1127ea9: 462 } },
+           ({ #d121c0bd: 516 },
+            { #f9c96be9: { #c1127ea9: 464 } },
             { #08ec7593: [ { #c1127ea9: 59 } ] })>,
-        <#e5fe99ea: ({ #d121c0bd: 195 }, { #c1127ea9: 509 })>,
-        <#2e3d736c: ({ #d121c0bd: 228 }, { #c1127ea9: 491 })>,
+        <#e5fe99ea: ({ #d121c0bd: 197 }, { #c1127ea9: 512 })>,
+        <#2e3d736c: ({ #d121c0bd: 230 }, { #c1127ea9: 494 })>,
         <#da0c5ecf:
-           ({ #d121c0bd: 274 },
-            { #cd26765d: { #c1127ea9: 420 }, #11302019: 1 },
+           ({ #d121c0bd: 276 },
+            { #cd26765d: { #c1127ea9: 422 }, #11302019: 1 },
             10)>,
-        <#2e3d736c: ({ #d121c0bd: 289 }, { #c1127ea9: 501 })>,
+        <#2e3d736c: ({ #d121c0bd: 291 }, { #c1127ea9: 504 })>,
         <#da0c5ecf:
-           ({ #d121c0bd: 286 },
-            { #cd26765d: { #c1127ea9: 420 }, #11302019: 1 },
+           ({ #d121c0bd: 288 },
+            { #cd26765d: { #c1127ea9: 422 }, #11302019: 1 },
             14)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 299 },
-            { #cd26765d: { #c1127ea9: 420 }, #11302019: 1 },
+           ({ #d121c0bd: 301 },
+            { #cd26765d: { #c1127ea9: 422 }, #11302019: 1 },
             8)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 310 },
-            { #cd26765d: { #c1127ea9: 420 }, #11302019: 1 },
+           ({ #d121c0bd: 312 },
+            { #cd26765d: { #c1127ea9: 422 }, #11302019: 1 },
             7)>,
-        <#e1d903a1: ({ #d121c0bd: 514, #26f32be5: 479 })>,
-        <#2374f4e7: ({ #d121c0bd: 515 }, 365)>,
-        <#2374f4e7: ({ #d121c0bd: 516 }, 366)>,
+        <#e1d903a1: ({ #d121c0bd: 517, #26f32be5: 482 })>,
+        <#2374f4e7: ({ #d121c0bd: 518 }, 367)>,
+        <#2374f4e7: ({ #d121c0bd: 519 }, 368)>,
         <#0098a8c5:
-           ({ #d121c0bd: 517 },
-            { #fcd148e8: 515, #25309442: [ { #c1127ea9: 30 } ] })>,
-        <#2e3d736c: ({ #d121c0bd: 370 }, { #c1127ea9: 517 })>,
-        <#2374f4e7: ({ #d121c0bd: 518 }, 373)>,
-        <#2e3d736c: ({ #d121c0bd: 378 }, { #c1127ea9: 518 })>,
-        <#d3d219f7: ({ #d121c0bd: 396 }, { #c1127ea9: 170 })>,
+           ({ #d121c0bd: 520 },
+            { #fcd148e8: 518, #25309442: [ { #c1127ea9: 30 } ] })>,
+        <#2e3d736c: ({ #d121c0bd: 372 }, { #c1127ea9: 520 })>,
+        <#2374f4e7: ({ #d121c0bd: 521 }, 375)>,
+        <#2e3d736c: ({ #d121c0bd: 380 }, { #c1127ea9: 521 })>,
+        <#d3d219f7: ({ #d121c0bd: 398 }, { #c1127ea9: 172 })>,
         <#26796f6a:
-           ({ #d121c0bd: 393 },
+           ({ #d121c0bd: 395 },
             { #f9c96be9: { #c1127ea9: 53 } },
-            { #08ec7593: [ { #c1127ea9: 53 }, { #c1127ea9: 396 } ] })>,
+            { #08ec7593: [ { #c1127ea9: 53 }, { #c1127ea9: 398 } ] })>,
         <#da0c5ecf:
-           ({ #d121c0bd: 409 },
-            { #cd26765d: { #c1127ea9: 420 }, #11302019: 1 },
+           ({ #d121c0bd: 411 },
+            { #cd26765d: { #c1127ea9: 422 }, #11302019: 1 },
             6)>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/available_expression.m.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/available_expression.m.exp
index d37c63ef2..db01ef5a3 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/available_expression.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/available_expression.m.exp
@@ -368,33 +368,34 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
         <#d3d219f7: ({ #d121c0bd: 92 }, { #c1127ea9: 18 })>,
         <#22d546dd: ({ #d121c0bd: 93 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 94 }, <#2fe155d3>)>,
-        <#d3d219f7: ({ #d121c0bd: 95 }, { #c1127ea9: 91 })>,
-        <#0098a8c5: ({ #d121c0bd: 96 }, { #fcd148e8: 89 })>,
-        <#2e3d736c: ({ #d121c0bd: 97 }, { #c1127ea9: 96 })>,
-        <#0098a8c5: ({ #d121c0bd: 98 }, { #fcd148e8: 90 })>,
-        <#2e3d736c: ({ #d121c0bd: 99 }, { #c1127ea9: 98 })>,
-        <#2374f4e7: ({ #d121c0bd: 100 }, 9)>,
-        <#d80cb60b: ({ #d121c0bd: 101 }, 102)>,
-        <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 20, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 104 }, { #c1127ea9: 35, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 105 }, { #c1127ea9: 35 })>,
-        <#d80cb60b: ({ #d121c0bd: 106 }, 107)>,
+        <#22d546dd: ({ #d121c0bd: 95 }, <#f65b235f>)>,
+        <#d3d219f7: ({ #d121c0bd: 96 }, { #c1127ea9: 91 })>,
+        <#0098a8c5: ({ #d121c0bd: 97 }, { #fcd148e8: 89 })>,
+        <#2e3d736c: ({ #d121c0bd: 98 }, { #c1127ea9: 97 })>,
+        <#0098a8c5: ({ #d121c0bd: 99 }, { #fcd148e8: 90 })>,
+        <#2e3d736c: ({ #d121c0bd: 100 }, { #c1127ea9: 99 })>,
+        <#2374f4e7: ({ #d121c0bd: 101 }, 9)>,
+        <#d80cb60b: ({ #d121c0bd: 102 }, 103)>,
+        <#d3d219f7: ({ #d121c0bd: 104 }, { #c1127ea9: 20, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 105 }, { #c1127ea9: 35, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 106 }, { #c1127ea9: 35 })>,
+        <#d80cb60b: ({ #d121c0bd: 107 }, 108)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 108 },
-            { #cd26765d: { #c1127ea9: 106 }, #11302019: 24 },
+           ({ #d121c0bd: 109 },
+            { #cd26765d: { #c1127ea9: 107 }, #11302019: 24 },
             1)>,
-        <#2374f4e7: ({ #d121c0bd: 109 }, 13)>,
-        <#2374f4e7: ({ #d121c0bd: 110 }, 15)>,
-        <#2e3d736c: ({ #d121c0bd: 22 }, { #c1127ea9: 110 })>,
+        <#2374f4e7: ({ #d121c0bd: 110 }, 13)>,
+        <#2374f4e7: ({ #d121c0bd: 111 }, 15)>,
+        <#2e3d736c: ({ #d121c0bd: 22 }, { #c1127ea9: 111 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 7, #26f32be5: 97 },
-            { #0b680f7d: { #c1127ea9: 97 }, #c3687459: 6 })>,
+           ({ #d121c0bd: 7, #26f32be5: 98 },
+            { #0b680f7d: { #c1127ea9: 98 }, #c3687459: 6 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 34, #26f32be5: 97 },
+           ({ #d121c0bd: 34, #26f32be5: 98 },
             { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 33 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 5, #26f32be5: 95 },
-            { #0b680f7d: { #c1127ea9: 95 }, #c3687459: 4 })>,
+           ({ #d121c0bd: 5, #26f32be5: 96 },
+            { #0b680f7d: { #c1127ea9: 96 }, #c3687459: 4 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/bind_temporary.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/bind_temporary.cpp.exp
index 72946c17d..96f771276 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/bind_temporary.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/bind_temporary.cpp.exp
@@ -88,7 +88,7 @@
                 { #c8ff724b: "S", #2cdb06fb: [ "S", "S" ] },
                 { #c1127ea9: 12 },
                 {
-                  #d2e9b40c: "320519083853435709",
+                  #d2e9b40c: "18026356147569087964",
                   #f1a45f0e: true,
                   #ebe3c415: 11,
                   #c11b7aa2:
@@ -113,7 +113,7 @@
                 { #c8ff724b: "~S", #2cdb06fb: [ "~S", "S" ] },
                 { #c1127ea9: 15 },
                 {
-                  #d2e9b40c: "3243028866176254141",
+                  #d2e9b40c: "1879755393825675851",
                   #f1a45f0e: true,
                   #ebe3c415: 14,
                   #c11b7aa2:
@@ -137,7 +137,7 @@
                 { #c8ff724b: "S", #2cdb06fb: [ "S", "S" ] },
                 { #c1127ea9: 18 },
                 {
-                  #d2e9b40c: "1635307583371793064",
+                  #d2e9b40c: "1652559256541304523",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -514,40 +514,41 @@
         <#d3d219f7: ({ #d121c0bd: 95 }, { #c1127ea9: 33 })>,
         <#22d546dd: ({ #d121c0bd: 96 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 97 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 98 }, 99)>,
-        <#d3d219f7: ({ #d121c0bd: 100 }, { #c1127ea9: 38, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 101 }, { #c1127ea9: 35, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 102 }, { #c1127ea9: 35 })>,
-        <#d80cb60b: ({ #d121c0bd: 103 }, 104)>,
+        <#22d546dd: ({ #d121c0bd: 98 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 99 }, 100)>,
+        <#d3d219f7: ({ #d121c0bd: 101 }, { #c1127ea9: 38, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 102 }, { #c1127ea9: 35, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 35 })>,
+        <#d80cb60b: ({ #d121c0bd: 104 }, 105)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 105 },
-            { #cd26765d: { #c1127ea9: 103 }, #11302019: 24 },
+           ({ #d121c0bd: 106 },
+            { #cd26765d: { #c1127ea9: 104 }, #11302019: 24 },
             1)>,
         <#d80cb60b: ({ #d121c0bd: 8 }, 7)>,
-        <#d3d219f7: ({ #d121c0bd: 106 }, { #c1127ea9: 8 })>,
+        <#d3d219f7: ({ #d121c0bd: 107 }, { #c1127ea9: 8 })>,
         <#26796f6a:
            ({ #d121c0bd: 12 }, { #f9c96be9: { #c1127ea9: 33 } }, { })>,
         <#26796f6a:
-           ({ #d121c0bd: 107 }, { #f9c96be9: { #c1127ea9: 33 } }, { })>,
+           ({ #d121c0bd: 108 }, { #f9c96be9: { #c1127ea9: 33 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 15 }, { #f9c96be9: { #c1127ea9: 33 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 20 }, { #c1127ea9: 8, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 108 },
+           ({ #d121c0bd: 109 },
             { #f9c96be9: { #c1127ea9: 33 } },
             { #08ec7593: [ { #c1127ea9: 20 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 18 },
             { #f9c96be9: { #c1127ea9: 33 } },
             { #08ec7593: [ { #c1127ea9: 20 } ] })>,
-        <#0098a8c5: ({ #d121c0bd: 109 }, { #fcd148e8: 92 })>,
-        <#2e3d736c: ({ #d121c0bd: 110 }, { #c1127ea9: 109 })>,
+        <#0098a8c5: ({ #d121c0bd: 110 }, { #fcd148e8: 92 })>,
+        <#2e3d736c: ({ #d121c0bd: 111 }, { #c1127ea9: 110 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 111, #26f32be5: 110 },
-            { #0b680f7d: { #c1127ea9: 110 }, #c3687459: 112 })>,
+           ({ #d121c0bd: 112, #26f32be5: 111 },
+            { #0b680f7d: { #c1127ea9: 111 }, #c3687459: 113 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 32, #26f32be5: 110 },
-            { #0b680f7d: { #c1127ea9: 111 }, #c3687459: 31 })>,
+           ({ #d121c0bd: 32, #26f32be5: 111 },
+            { #0b680f7d: { #c1127ea9: 112 }, #c3687459: 31 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_attributes.c.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_attributes.c.exp
index 4eee03a4f..fd81a6dc3 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_attributes.c.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_attributes.c.exp
@@ -150,27 +150,28 @@
         <#d3d219f7: ({ #d121c0bd: 73 }, { #c1127ea9: 14 })>,
         <#22d546dd: ({ #d121c0bd: 74 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 75 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 76 }, 77)>,
-        <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 11, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 79 }, { #c1127ea9: 16, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 80 }, { #c1127ea9: 16 })>,
-        <#d80cb60b: ({ #d121c0bd: 81 }, 82)>,
+        <#22d546dd: ({ #d121c0bd: 76 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 77 }, 78)>,
+        <#d3d219f7: ({ #d121c0bd: 79 }, { #c1127ea9: 11, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 80 }, { #c1127ea9: 16, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 81 }, { #c1127ea9: 16 })>,
+        <#d80cb60b: ({ #d121c0bd: 82 }, 83)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 83 },
-            { #cd26765d: { #c1127ea9: 81 }, #11302019: 24 },
+           ({ #d121c0bd: 84 },
+            { #cd26765d: { #c1127ea9: 82 }, #11302019: 24 },
             1)>,
         <#26796f6a:
            ({ #d121c0bd: 9 },
             { #f9c96be9: { #c1127ea9: 11 } },
             { #08ec7593: [ { #c1127ea9: 11 } ] })>,
-        <#0098a8c5: ({ #d121c0bd: 84 }, { #fcd148e8: 70 })>,
-        <#2e3d736c: ({ #d121c0bd: 85 }, { #c1127ea9: 84 })>,
+        <#0098a8c5: ({ #d121c0bd: 85 }, { #fcd148e8: 70 })>,
+        <#2e3d736c: ({ #d121c0bd: 86 }, { #c1127ea9: 85 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 86, #26f32be5: 85 },
-            { #0b680f7d: { #c1127ea9: 85 }, #c3687459: 87 })>,
+           ({ #d121c0bd: 87, #26f32be5: 86 },
+            { #0b680f7d: { #c1127ea9: 86 }, #c3687459: 88 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 13, #26f32be5: 85 },
-            { #0b680f7d: { #c1127ea9: 86 }, #c3687459: 12 })>,
+           ({ #d121c0bd: 13, #26f32be5: 86 },
+            { #0b680f7d: { #c1127ea9: 87 }, #c3687459: 12 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_cast.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_cast.cpp.exp
index 22a451a0f..cb93d3fae 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_cast.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_cast.cpp.exp
@@ -265,23 +265,24 @@
         <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 23 })>,
         <#22d546dd: ({ #d121c0bd: 84 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 85 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 86 }, 87)>,
-        <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 8, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 25, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 25 })>,
-        <#d80cb60b: ({ #d121c0bd: 91 }, 92)>,
+        <#22d546dd: ({ #d121c0bd: 86 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 87 }, 88)>,
+        <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 8, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 25, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 25 })>,
+        <#d80cb60b: ({ #d121c0bd: 92 }, 93)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 93 },
-            { #cd26765d: { #c1127ea9: 91 }, #11302019: 24 },
+           ({ #d121c0bd: 94 },
+            { #cd26765d: { #c1127ea9: 92 }, #11302019: 24 },
             1)>,
-        <#0098a8c5: ({ #d121c0bd: 94 }, { #fcd148e8: 80 })>,
-        <#2e3d736c: ({ #d121c0bd: 95 }, { #c1127ea9: 94 })>,
+        <#0098a8c5: ({ #d121c0bd: 95 }, { #fcd148e8: 80 })>,
+        <#2e3d736c: ({ #d121c0bd: 96 }, { #c1127ea9: 95 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 96, #26f32be5: 95 },
-            { #0b680f7d: { #c1127ea9: 95 }, #c3687459: 97 })>,
+           ({ #d121c0bd: 97, #26f32be5: 96 },
+            { #0b680f7d: { #c1127ea9: 96 }, #c3687459: 98 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 22, #26f32be5: 95 },
-            { #0b680f7d: { #c1127ea9: 96 }, #c3687459: 21 })>,
+           ({ #d121c0bd: 22, #26f32be5: 96 },
+            { #0b680f7d: { #c1127ea9: 97 }, #c3687459: 21 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/class_template.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/class_template.cpp.exp
index 0d47195f6..aa1ab1ed7 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/class_template.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/class_template.cpp.exp
@@ -126,7 +126,7 @@
                               },
                               { #c1127ea9: 15 },
                               {
-                                #d2e9b40c: "7066629788491464130",
+                                #d2e9b40c: "5073671504388348295",
                                 #f1a45f0e: true,
                                 #3e64314e: true,
                                 #ebe3c415: 14,
@@ -197,7 +197,7 @@
                               },
                               { #c1127ea9: 20 },
                               {
-                                #d2e9b40c: "11949468677960817094",
+                                #d2e9b40c: "8283222246682784723",
                                 #f1a45f0e: true,
                                 #3e64314e: true,
                                 #d17ebeaa: [
@@ -228,7 +228,7 @@
                               },
                               { #c1127ea9: 24 },
                               {
-                                #d2e9b40c: "14813278630171558444",
+                                #d2e9b40c: "6839343167991811455",
                                 #f1a45f0e: true,
                                 #3e64314e: true,
                                 #d17ebeaa: [
@@ -249,7 +249,7 @@
                         <#c5b1f8a9>,
                         { #33244202: 9, #1a9a7e84: true },
                         { #f1ae3b70: true },
-                        "15160212752071097404",
+                        "",
                         {
                           #e43971cf: 8,
                           #0de52551: [ <#37e21eda: { #c1127ea9: 27 }> ]
@@ -310,7 +310,7 @@
                 <#c5b1f8a9>,
                 { #33244202: 28, #1a9a7e84: true, #fd16bc2f: true },
                 { },
-                "15216485236755079891",
+                "",
                 {
                   #e43971cf: 8,
                   #0de52551: [ <#37e21eda: { #c1127ea9: 33 }> ]
@@ -371,7 +371,7 @@
                       { #c8ff724b: "S", #2cdb06fb: [ "S", "S<int>", "N" ] },
                       { #c1127ea9: 15 },
                       {
-                        #d2e9b40c: "13141222913637319333",
+                        #d2e9b40c: "12645234317802235044",
                         #f1a45f0e: true,
                         #3e64314e: true,
                         #ebe3c415: 18,
@@ -396,7 +396,7 @@
                       { #c8ff724b: "~S", #2cdb06fb: [ "~S", "S<int>", "N" ] },
                       { #c1127ea9: 41 },
                       {
-                        #d2e9b40c: "16063732695960137765",
+                        #d2e9b40c: "14822900838502915635",
                         #f1a45f0e: true,
                         #3e64314e: true
                       },
@@ -412,7 +412,7 @@
                       { #c8ff724b: "S", #2cdb06fb: [ "S", "S<int>", "N" ] },
                       { #c1127ea9: 43 },
                       {
-                        #d2e9b40c: "16241844907223898831",
+                        #d2e9b40c: "8232226518557505494",
                         #f1a45f0e: true,
                         #3e64314e: true,
                         #d17ebeaa: [
@@ -439,7 +439,7 @@
                       { #c8ff724b: "S", #2cdb06fb: [ "S", "S<int>", "N" ] },
                       { #c1127ea9: 47 },
                       {
-                        #d2e9b40c: "6117498947183732003",
+                        #d2e9b40c: "10012197224398183680",
                         #f1a45f0e: true,
                         #3e64314e: true,
                         #d17ebeaa: [
@@ -723,7 +723,7 @@
                     #30e4876a: { #c1127ea9: 41 }
                   }
                 },
-                "9300085993929073917",
+                "",
                 {
                   #e43971cf: 8,
                   #0de52551: [ <#37e21eda: { #c1127ea9: 38 }> ]
@@ -1065,57 +1065,58 @@
         <#d3d219f7: ({ #d121c0bd: 146 }, { #c1127ea9: 85 })>,
         <#22d546dd: ({ #d121c0bd: 147 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 148 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 149 }, 150)>,
-        <#d3d219f7: ({ #d121c0bd: 151 }, { #c1127ea9: 38, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 152 }, { #c1127ea9: 87, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 153 }, { #c1127ea9: 87 })>,
-        <#d80cb60b: ({ #d121c0bd: 154 }, 155)>,
+        <#22d546dd: ({ #d121c0bd: 149 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 150 }, 151)>,
+        <#d3d219f7: ({ #d121c0bd: 152 }, { #c1127ea9: 38, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 153 }, { #c1127ea9: 87, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 154 }, { #c1127ea9: 87 })>,
+        <#d80cb60b: ({ #d121c0bd: 155 }, 156)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 156 },
-            { #cd26765d: { #c1127ea9: 154 }, #11302019: 24 },
+           ({ #d121c0bd: 157 },
+            { #cd26765d: { #c1127ea9: 155 }, #11302019: 24 },
             1)>,
-        <#f3f3711a: ({ #d121c0bd: 157 })>,
         <#f3f3711a: ({ #d121c0bd: 158 })>,
-        <#ece2635f: ({ #d121c0bd: 159 })>,
+        <#f3f3711a: ({ #d121c0bd: 159 })>,
         <#ece2635f: ({ #d121c0bd: 160 })>,
-        <#d49f978d: ({ #d121c0bd: 161 })>,
+        <#ece2635f: ({ #d121c0bd: 161 })>,
+        <#d49f978d: ({ #d121c0bd: 162 })>,
         <#f3f3711a: ({ #d121c0bd: 32 })>,
-        <#d3d219f7: ({ #d121c0bd: 33 }, { #c1127ea9: 157 })>,
-        <#d3d219f7: ({ #d121c0bd: 162 }, { #c1127ea9: 32 })>,
-        <#ece2635f: ({ #d121c0bd: 163 })>,
+        <#d3d219f7: ({ #d121c0bd: 33 }, { #c1127ea9: 158 })>,
+        <#d3d219f7: ({ #d121c0bd: 163 }, { #c1127ea9: 32 })>,
         <#ece2635f: ({ #d121c0bd: 164 })>,
-        <#d49f978d: ({ #d121c0bd: 29 })>,
         <#ece2635f: ({ #d121c0bd: 165 })>,
+        <#d49f978d: ({ #d121c0bd: 29 })>,
+        <#ece2635f: ({ #d121c0bd: 166 })>,
         <#d80cb60b: ({ #d121c0bd: 35 }, 34)>,
-        <#ece2635f: ({ #d121c0bd: 166, #26f32be5: 35 })>,
+        <#ece2635f: ({ #d121c0bd: 167, #26f32be5: 35 })>,
         <#ece2635f: ({ #d121c0bd: 69, #26f32be5: 35 })>,
         <#26796f6a:
-           ({ #d121c0bd: 167 },
+           ({ #d121c0bd: 168 },
             { #f9c96be9: { #c1127ea9: 85 } },
             { #08ec7593: [ { #c1127ea9: 35 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 67 },
             { #f9c96be9: { #c1127ea9: 85 } },
             { #08ec7593: [ { #c1127ea9: 69 } ] })>,
-        <#ece2635f: ({ #d121c0bd: 168, #26f32be5: 35 })>,
+        <#ece2635f: ({ #d121c0bd: 169, #26f32be5: 35 })>,
         <#d3d219f7: ({ #d121c0bd: 27 }, { #c1127ea9: 35 })>,
-        <#d3d219f7: ({ #d121c0bd: 169 }, { #c1127ea9: 168 })>,
+        <#d3d219f7: ({ #d121c0bd: 170 }, { #c1127ea9: 169 })>,
         <#d80cb60b: ({ #d121c0bd: 10 }, 9)>,
         <#ece2635f: ({ #d121c0bd: 73, #26f32be5: 10 })>,
         <#dd64b59b: ({ #d121c0bd: 13, #26f32be5: 35 })>,
-        <#d3d219f7: ({ #d121c0bd: 170 }, { #c1127ea9: 13 })>,
-        <#26796f6a:
-           ({ #d121c0bd: 171 }, { #f9c96be9: { #c1127ea9: 85 } }, { })>,
+        <#d3d219f7: ({ #d121c0bd: 171 }, { #c1127ea9: 13 })>,
         <#26796f6a:
            ({ #d121c0bd: 172 }, { #f9c96be9: { #c1127ea9: 85 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 173 }, { #f9c96be9: { #c1127ea9: 85 } }, { })>,
+        <#26796f6a:
+           ({ #d121c0bd: 174 }, { #f9c96be9: { #c1127ea9: 85 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 41 }, { #f9c96be9: { #c1127ea9: 85 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 22 }, { #c1127ea9: 10, #ea1a680e: true })>,
         <#0b08cd60: ({ #d121c0bd: 45 }, { #c1127ea9: 35, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 174 },
+           ({ #d121c0bd: 175 },
             { #f9c96be9: { #c1127ea9: 85 } },
             { #08ec7593: [ { #c1127ea9: 45 } ] })>,
         <#26796f6a:
@@ -1124,7 +1125,7 @@
             { #08ec7593: [ { #c1127ea9: 45 } ] })>,
         <#295746e6: ({ #d121c0bd: 49 }, { #c1127ea9: 35 })>,
         <#26796f6a:
-           ({ #d121c0bd: 175 },
+           ({ #d121c0bd: 176 },
             { #f9c96be9: { #c1127ea9: 85 } },
             { #08ec7593: [ { #c1127ea9: 49 } ] })>,
         <#26796f6a:
@@ -1132,7 +1133,7 @@
             { #f9c96be9: { #c1127ea9: 85 } },
             { #08ec7593: [ { #c1127ea9: 49 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 176 },
+           ({ #d121c0bd: 177 },
             { #f9c96be9: { #c1127ea9: 85 } },
             { #08ec7593: [ { #c1127ea9: 22 } ] })>,
         <#26796f6a:
@@ -1141,7 +1142,7 @@
             { #08ec7593: [ { #c1127ea9: 22 } ] })>,
         <#295746e6: ({ #d121c0bd: 26 }, { #c1127ea9: 10 })>,
         <#26796f6a:
-           ({ #d121c0bd: 177 },
+           ({ #d121c0bd: 178 },
             { #f9c96be9: { #c1127ea9: 85 } },
             { #08ec7593: [ { #c1127ea9: 26 } ] })>,
         <#26796f6a:
@@ -1150,37 +1151,37 @@
             { #08ec7593: [ { #c1127ea9: 26 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 15 }, { #f9c96be9: { #c1127ea9: 85 } }, { })>,
-        <#0b08cd60: ({ #d121c0bd: 178 }, { #c1127ea9: 35 })>,
-        <#26796f6a:
-           ({ #d121c0bd: 179 },
-            { #f9c96be9: { #c1127ea9: 178 } },
-            { #08ec7593: [ { #c1127ea9: 45 } ] })>,
+        <#0b08cd60: ({ #d121c0bd: 179 }, { #c1127ea9: 35 })>,
         <#26796f6a:
            ({ #d121c0bd: 180 },
-            { #f9c96be9: { #c1127ea9: 178 } },
+            { #f9c96be9: { #c1127ea9: 179 } },
             { #08ec7593: [ { #c1127ea9: 45 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 181 },
-            { #f9c96be9: { #c1127ea9: 178 } },
+            { #f9c96be9: { #c1127ea9: 179 } },
+            { #08ec7593: [ { #c1127ea9: 45 } ] })>,
+        <#26796f6a:
+           ({ #d121c0bd: 182 },
+            { #f9c96be9: { #c1127ea9: 179 } },
             { #08ec7593: [ { #c1127ea9: 49 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 64 },
-            { #f9c96be9: { #c1127ea9: 178 } },
+            { #f9c96be9: { #c1127ea9: 179 } },
             { #08ec7593: [ { #c1127ea9: 49 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 51 },
-            { #f9c96be9: { #c1127ea9: 178 } },
+            { #f9c96be9: { #c1127ea9: 179 } },
             { #08ec7593: [ { #c1127ea9: 45 } ] })>,
-        <#d3d219f7: ({ #d121c0bd: 182 }, { #c1127ea9: 179 })>,
+        <#d3d219f7: ({ #d121c0bd: 183 }, { #c1127ea9: 180 })>,
         <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 51 })>,
-        <#0098a8c5: ({ #d121c0bd: 183 }, { #fcd148e8: 143 })>,
-        <#2e3d736c: ({ #d121c0bd: 184 }, { #c1127ea9: 183 })>,
+        <#0098a8c5: ({ #d121c0bd: 184 }, { #fcd148e8: 143 })>,
+        <#2e3d736c: ({ #d121c0bd: 185 }, { #c1127ea9: 184 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 185, #26f32be5: 184 },
-            { #0b680f7d: { #c1127ea9: 184 }, #c3687459: 186 })>,
+           ({ #d121c0bd: 186, #26f32be5: 185 },
+            { #0b680f7d: { #c1127ea9: 185 }, #c3687459: 187 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 84, #26f32be5: 184 },
-            { #0b680f7d: { #c1127ea9: 185 }, #c3687459: 83 })>,
+           ({ #d121c0bd: 84, #26f32be5: 185 },
+            { #0b680f7d: { #c1127ea9: 186 }, #c3687459: 83 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/comments.c.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/comments.c.exp
index 435cd3124..c54f29db8 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/comments.c.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/comments.c.exp
@@ -137,24 +137,25 @@
         <#d3d219f7: ({ #d121c0bd: 72 }, { #c1127ea9: 12 })>,
         <#22d546dd: ({ #d121c0bd: 73 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 74 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 75 }, 76)>,
-        <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 17, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 14, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 79 }, { #c1127ea9: 14 })>,
-        <#d80cb60b: ({ #d121c0bd: 80 }, 81)>,
+        <#22d546dd: ({ #d121c0bd: 75 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 76 }, 77)>,
+        <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 17, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 79 }, { #c1127ea9: 14, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 80 }, { #c1127ea9: 14 })>,
+        <#d80cb60b: ({ #d121c0bd: 81 }, 82)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 82 },
-            { #cd26765d: { #c1127ea9: 80 }, #11302019: 24 },
+           ({ #d121c0bd: 83 },
+            { #cd26765d: { #c1127ea9: 81 }, #11302019: 24 },
             1)>,
         <#01fe18e9: ({ #d121c0bd: 8 }, { #f9c96be9: { #c1127ea9: 12 } })>,
-        <#0098a8c5: ({ #d121c0bd: 83 }, { #fcd148e8: 69 })>,
-        <#2e3d736c: ({ #d121c0bd: 84 }, { #c1127ea9: 83 })>,
+        <#0098a8c5: ({ #d121c0bd: 84 }, { #fcd148e8: 69 })>,
+        <#2e3d736c: ({ #d121c0bd: 85 }, { #c1127ea9: 84 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 85, #26f32be5: 84 },
-            { #0b680f7d: { #c1127ea9: 84 }, #c3687459: 86 })>,
+           ({ #d121c0bd: 86, #26f32be5: 85 },
+            { #0b680f7d: { #c1127ea9: 85 }, #c3687459: 87 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 11, #26f32be5: 84 },
-            { #0b680f7d: { #c1127ea9: 85 }, #c3687459: 10 })>,
+           ({ #d121c0bd: 11, #26f32be5: 85 },
+            { #0b680f7d: { #c1127ea9: 86 }, #c3687459: 10 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/const_cast.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/const_cast.cpp.exp
index fc42df98f..fa1673453 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/const_cast.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/const_cast.cpp.exp
@@ -410,17 +410,18 @@
         <#d3d219f7: ({ #d121c0bd: 93 }, { #c1127ea9: 28 })>,
         <#22d546dd: ({ #d121c0bd: 94 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 95 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 96 }, 97)>,
-        <#d3d219f7: ({ #d121c0bd: 98 }, { #c1127ea9: 30, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 99 }, { #c1127ea9: 35, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 100 }, { #c1127ea9: 35 })>,
-        <#d80cb60b: ({ #d121c0bd: 101 }, 102)>,
+        <#22d546dd: ({ #d121c0bd: 96 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 97 }, 98)>,
+        <#d3d219f7: ({ #d121c0bd: 99 }, { #c1127ea9: 30, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 100 }, { #c1127ea9: 35, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 101 }, { #c1127ea9: 35 })>,
+        <#d80cb60b: ({ #d121c0bd: 102 }, 103)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 103 },
-            { #cd26765d: { #c1127ea9: 101 }, #11302019: 24 },
+           ({ #d121c0bd: 104 },
+            { #cd26765d: { #c1127ea9: 102 }, #11302019: 24 },
             1)>,
         <#d80cb60b: ({ #d121c0bd: 8 }, 7)>,
-        <#d3d219f7: ({ #d121c0bd: 104 }, { #c1127ea9: 8 })>,
+        <#d3d219f7: ({ #d121c0bd: 105 }, { #c1127ea9: 8 })>,
         <#26796f6a:
            ({ #d121c0bd: 12 }, { #f9c96be9: { #c1127ea9: 28 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 17 }, { #c1127ea9: 8, #ea1a680e: true })>,
@@ -429,15 +430,15 @@
             { #f9c96be9: { #c1127ea9: 28 } },
             { #08ec7593: [ { #c1127ea9: 17 } ] })>,
         <#0b08cd60: ({ #d121c0bd: 22 }, { #c1127ea9: 8 })>,
-        <#d3d219f7: ({ #d121c0bd: 105 }, { #c1127ea9: 8, #ea1a680e: true })>,
-        <#0098a8c5: ({ #d121c0bd: 106 }, { #fcd148e8: 90 })>,
-        <#2e3d736c: ({ #d121c0bd: 107 }, { #c1127ea9: 106 })>,
+        <#d3d219f7: ({ #d121c0bd: 106 }, { #c1127ea9: 8, #ea1a680e: true })>,
+        <#0098a8c5: ({ #d121c0bd: 107 }, { #fcd148e8: 90 })>,
+        <#2e3d736c: ({ #d121c0bd: 108 }, { #c1127ea9: 107 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 108, #26f32be5: 107 },
-            { #0b680f7d: { #c1127ea9: 107 }, #c3687459: 109 })>,
+           ({ #d121c0bd: 109, #26f32be5: 108 },
+            { #0b680f7d: { #c1127ea9: 108 }, #c3687459: 110 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 33, #26f32be5: 107 },
-            { #0b680f7d: { #c1127ea9: 108 }, #c3687459: 32 })>,
+           ({ #d121c0bd: 33, #26f32be5: 108 },
+            { #0b680f7d: { #c1127ea9: 109 }, #c3687459: 32 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/dynamic_cast.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/dynamic_cast.cpp.exp
index 50dafc56a..2a06bab81 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/dynamic_cast.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/dynamic_cast.cpp.exp
@@ -156,7 +156,7 @@
                 { #c8ff724b: "~A", #2cdb06fb: [ "~A", "A" ] },
                 { #c1127ea9: 22 },
                 {
-                  #d2e9b40c: "5328378654181921475",
+                  #d2e9b40c: "6691652126532499765",
                   #f1a45f0e: true,
                   #3e64314e: true
                 },
@@ -174,7 +174,7 @@
                 { #c8ff724b: "A", #2cdb06fb: [ "A", "A" ] },
                 { #c1127ea9: 24 },
                 {
-                  #d2e9b40c: "14779025497907219583",
+                  #d2e9b40c: "16649858826465904026",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #ebe3c415: 23,
@@ -198,7 +198,7 @@
                 { #c8ff724b: "A", #2cdb06fb: [ "A", "A" ] },
                 { #c1127ea9: 27 },
                 {
-                  #d2e9b40c: "3430056695640597274",
+                  #d2e9b40c: "6367731417382615745",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -224,7 +224,7 @@
                 { #c8ff724b: "A", #2cdb06fb: [ "A", "A" ] },
                 { #c1127ea9: 30 },
                 {
-                  #d2e9b40c: "1361265890968139694",
+                  #d2e9b40c: "17956886967408801671",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -339,7 +339,7 @@
                 { #c8ff724b: "~B", #2cdb06fb: [ "~B", "B" ] },
                 { #c1127ea9: 44 },
                 {
-                  #d2e9b40c: "7876366742276079110",
+                  #d2e9b40c: "6627935060446176348",
                   #f1a45f0e: true,
                   #3e64314e: true
                 },
@@ -357,7 +357,7 @@
                 { #c8ff724b: "B", #2cdb06fb: [ "B", "B" ] },
                 { #c1127ea9: 24 },
                 {
-                  #d2e9b40c: "10798876524598897542",
+                  #d2e9b40c: "8928078380412315851",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #ebe3c415: 45,
@@ -408,7 +408,7 @@
                 { #c8ff724b: "B", #2cdb06fb: [ "B", "B" ] },
                 { #c1127ea9: 49 },
                 {
-                  #d2e9b40c: "7710293714478488613",
+                  #d2e9b40c: "6925252787601137710",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -434,7 +434,7 @@
                 { #c8ff724b: "B", #2cdb06fb: [ "B", "B" ] },
                 { #c1127ea9: 52 },
                 {
-                  #d2e9b40c: "16903082029399050859",
+                  #d2e9b40c: "17350102287109130674",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -1745,14 +1745,15 @@
         <#d3d219f7: ({ #d121c0bd: 173 }, { #c1127ea9: 111 })>,
         <#22d546dd: ({ #d121c0bd: 174 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 175 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 176 }, 177)>,
-        <#d3d219f7: ({ #d121c0bd: 178 }, { #c1127ea9: 116, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 179 }, { #c1127ea9: 113, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 180 }, { #c1127ea9: 113 })>,
-        <#d80cb60b: ({ #d121c0bd: 181 }, 182)>,
+        <#22d546dd: ({ #d121c0bd: 176 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 177 }, 178)>,
+        <#d3d219f7: ({ #d121c0bd: 179 }, { #c1127ea9: 116, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 180 }, { #c1127ea9: 113, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 181 }, { #c1127ea9: 113 })>,
+        <#d80cb60b: ({ #d121c0bd: 182 }, 183)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 183 },
-            { #cd26765d: { #c1127ea9: 181 }, #11302019: 24 },
+           ({ #d121c0bd: 184 },
+            { #cd26765d: { #c1127ea9: 182 }, #11302019: 24 },
             1)>,
         <#d80cb60b: ({ #d121c0bd: 8 }, 7)>,
         <#d3d219f7: ({ #d121c0bd: 70 }, { #c1127ea9: 8 })>,
@@ -1761,7 +1762,7 @@
         <#0b08cd60: ({ #d121c0bd: 93 }, { #c1127ea9: 8 })>,
         <#0b08cd60: ({ #d121c0bd: 16 }, { #c1127ea9: 8, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 184 },
+           ({ #d121c0bd: 185 },
             { #f9c96be9: { #c1127ea9: 93 } },
             { #08ec7593: [ { #c1127ea9: 16 } ] })>,
         <#26796f6a:
@@ -1770,7 +1771,7 @@
             { #08ec7593: [ { #c1127ea9: 16 } ] })>,
         <#295746e6: ({ #d121c0bd: 20 }, { #c1127ea9: 8 })>,
         <#26796f6a:
-           ({ #d121c0bd: 185 },
+           ({ #d121c0bd: 186 },
             { #f9c96be9: { #c1127ea9: 93 } },
             { #08ec7593: [ { #c1127ea9: 20 } ] })>,
         <#26796f6a:
@@ -1783,7 +1784,7 @@
         <#0b08cd60: ({ #d121c0bd: 100 }, { #c1127ea9: 33 })>,
         <#0b08cd60: ({ #d121c0bd: 38 }, { #c1127ea9: 33, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 186 },
+           ({ #d121c0bd: 187 },
             { #f9c96be9: { #c1127ea9: 100 } },
             { #08ec7593: [ { #c1127ea9: 38 } ] })>,
         <#26796f6a:
@@ -1792,7 +1793,7 @@
             { #08ec7593: [ { #c1127ea9: 38 } ] })>,
         <#295746e6: ({ #d121c0bd: 42 }, { #c1127ea9: 33 })>,
         <#26796f6a:
-           ({ #d121c0bd: 187 },
+           ({ #d121c0bd: 188 },
             { #f9c96be9: { #c1127ea9: 100 } },
             { #08ec7593: [ { #c1127ea9: 42 } ] })>,
         <#26796f6a:
@@ -1803,9 +1804,9 @@
            ({ #d121c0bd: 44 }, { #f9c96be9: { #c1127ea9: 111 } }, { })>,
         <#d80cb60b: ({ #d121c0bd: 55 }, 54)>,
         <#26796f6a:
-           ({ #d121c0bd: 188 }, { #f9c96be9: { #c1127ea9: 111 } }, { })>,
+           ({ #d121c0bd: 189 }, { #f9c96be9: { #c1127ea9: 111 } }, { })>,
         <#26796f6a:
-           ({ #d121c0bd: 189 },
+           ({ #d121c0bd: 190 },
             { #f9c96be9: { #c1127ea9: 111 } },
             { #08ec7593: [ { #c1127ea9: 16 } ] })>,
         <#26796f6a:
@@ -1813,7 +1814,7 @@
             { #f9c96be9: { #c1127ea9: 111 } },
             { #08ec7593: [ { #c1127ea9: 16 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 190 },
+           ({ #d121c0bd: 191 },
             { #f9c96be9: { #c1127ea9: 111 } },
             { #08ec7593: [ { #c1127ea9: 20 } ] })>,
         <#26796f6a:
@@ -1823,9 +1824,9 @@
         <#26796f6a:
            ({ #d121c0bd: 24 }, { #f9c96be9: { #c1127ea9: 111 } }, { })>,
         <#26796f6a:
-           ({ #d121c0bd: 191 }, { #f9c96be9: { #c1127ea9: 111 } }, { })>,
+           ({ #d121c0bd: 192 }, { #f9c96be9: { #c1127ea9: 111 } }, { })>,
         <#26796f6a:
-           ({ #d121c0bd: 192 },
+           ({ #d121c0bd: 193 },
             { #f9c96be9: { #c1127ea9: 111 } },
             { #08ec7593: [ { #c1127ea9: 38 } ] })>,
         <#26796f6a:
@@ -1833,7 +1834,7 @@
             { #f9c96be9: { #c1127ea9: 111 } },
             { #08ec7593: [ { #c1127ea9: 38 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 193 },
+           ({ #d121c0bd: 194 },
             { #f9c96be9: { #c1127ea9: 111 } },
             { #08ec7593: [ { #c1127ea9: 42 } ] })>,
         <#26796f6a:
@@ -1843,14 +1844,14 @@
         <#d3d219f7: ({ #d121c0bd: 69 }, { #c1127ea9: 33 })>,
         <#d3d219f7: ({ #d121c0bd: 86 }, { #c1127ea9: 55 })>,
         <#0b08cd60: ({ #d121c0bd: 107 }, { #c1127ea9: 55 })>,
-        <#0098a8c5: ({ #d121c0bd: 194 }, { #fcd148e8: 170 })>,
-        <#2e3d736c: ({ #d121c0bd: 195 }, { #c1127ea9: 194 })>,
+        <#0098a8c5: ({ #d121c0bd: 195 }, { #fcd148e8: 170 })>,
+        <#2e3d736c: ({ #d121c0bd: 196 }, { #c1127ea9: 195 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 196, #26f32be5: 195 },
-            { #0b680f7d: { #c1127ea9: 195 }, #c3687459: 197 })>,
+           ({ #d121c0bd: 197, #26f32be5: 196 },
+            { #0b680f7d: { #c1127ea9: 196 }, #c3687459: 198 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 110, #26f32be5: 195 },
-            { #0b680f7d: { #c1127ea9: 196 }, #c3687459: 109 })>,
+           ({ #d121c0bd: 110, #26f32be5: 196 },
+            { #0b680f7d: { #c1127ea9: 197 }, #c3687459: 109 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/expr_with_cleanups.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/expr_with_cleanups.cpp.exp
index 86371a3e7..93d8366e6 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/expr_with_cleanups.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/expr_with_cleanups.cpp.exp
@@ -88,7 +88,7 @@
                 { #c8ff724b: "X", #2cdb06fb: [ "X", "X" ] },
                 { #c1127ea9: 12 },
                 {
-                  #d2e9b40c: "4951616904021883133",
+                  #d2e9b40c: "5585539233588788972",
                   #f1a45f0e: true,
                   #d17ebeaa: [
                     <#fd75cc45:
@@ -115,7 +115,7 @@
                 { #c8ff724b: "X", #2cdb06fb: [ "X", "X" ] },
                 { #c1127ea9: 16 },
                 {
-                  #d2e9b40c: "11474741413113936247",
+                  #d2e9b40c: "7390596848467712836",
                   #f1a45f0e: true,
                   #d17ebeaa: [
                     <#fd75cc45:
@@ -168,7 +168,7 @@
                 },
                 { #c8ff724b: "~X", #2cdb06fb: [ "~X", "X" ] },
                 { #c1127ea9: 23 },
-                { #d2e9b40c: "9850251229546392500", #f1a45f0e: true },
+                { #d2e9b40c: "10975959821506117086", #f1a45f0e: true },
                 { })>
           ],
           { },
@@ -231,7 +231,7 @@
                 { #c8ff724b: "Y", #2cdb06fb: [ "Y", "Y" ] },
                 { #c1127ea9: 12 },
                 {
-                  #d2e9b40c: "14898886720565199942",
+                  #d2e9b40c: "16769418782937754571",
                   #f1a45f0e: true,
                   #d17ebeaa: [
                     <#fd75cc45:
@@ -257,7 +257,7 @@
                 },
                 { #c8ff724b: "~Y", #2cdb06fb: [ "~Y", "Y" ] },
                 { #c1127ea9: 23 },
-                { #d2e9b40c: "11799330211249239787", #f1a45f0e: true },
+                { #d2e9b40c: "13039880593729639901", #f1a45f0e: true },
                 { })>,
             <#cc498dc1:
                ({
@@ -273,7 +273,7 @@
                 { #c8ff724b: "Y", #2cdb06fb: [ "Y", "Y" ] },
                 { #c1127ea9: 32 },
                 {
-                  #d2e9b40c: "7125450473324676530",
+                  #d2e9b40c: "18119742553314115417",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -2752,17 +2752,18 @@
         <#d3d219f7: ({ #d121c0bd: 174 }, { #c1127ea9: 113 })>,
         <#22d546dd: ({ #d121c0bd: 175 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 176 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 177 }, 178)>,
-        <#d3d219f7: ({ #d121c0bd: 179 }, { #c1127ea9: 14, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 180 }, { #c1127ea9: 115, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 181 }, { #c1127ea9: 115 })>,
-        <#d80cb60b: ({ #d121c0bd: 182 }, 183)>,
+        <#22d546dd: ({ #d121c0bd: 177 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 178 }, 179)>,
+        <#d3d219f7: ({ #d121c0bd: 180 }, { #c1127ea9: 14, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 181 }, { #c1127ea9: 115, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 182 }, { #c1127ea9: 115 })>,
+        <#d80cb60b: ({ #d121c0bd: 183 }, 184)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 184 },
-            { #cd26765d: { #c1127ea9: 182 }, #11302019: 24 },
+           ({ #d121c0bd: 185 },
+            { #cd26765d: { #c1127ea9: 183 }, #11302019: 24 },
             1)>,
         <#d80cb60b: ({ #d121c0bd: 8 }, 7)>,
-        <#d3d219f7: ({ #d121c0bd: 185 }, { #c1127ea9: 8 })>,
+        <#d3d219f7: ({ #d121c0bd: 186 }, { #c1127ea9: 8 })>,
         <#26796f6a:
            ({ #d121c0bd: 12 },
             { #f9c96be9: { #c1127ea9: 113 } },
@@ -2772,19 +2773,19 @@
            ({ #d121c0bd: 16 },
             { #f9c96be9: { #c1127ea9: 113 } },
             { #08ec7593: [ { #c1127ea9: 18 } ] })>,
-        <#0b08cd60: ({ #d121c0bd: 186 }, { #c1127ea9: 8 })>,
+        <#0b08cd60: ({ #d121c0bd: 187 }, { #c1127ea9: 8 })>,
         <#26796f6a:
            ({ #d121c0bd: 20 },
-            { #f9c96be9: { #c1127ea9: 186 } },
+            { #f9c96be9: { #c1127ea9: 187 } },
             { #08ec7593: [ { #c1127ea9: 18 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 43 }, { #f9c96be9: { #c1127ea9: 113 } }, { })>,
         <#26796f6a:
-           ({ #d121c0bd: 187 }, { #f9c96be9: { #c1127ea9: 113 } }, { })>,
+           ({ #d121c0bd: 188 }, { #f9c96be9: { #c1127ea9: 113 } }, { })>,
         <#d80cb60b: ({ #d121c0bd: 25 }, 24)>,
-        <#d3d219f7: ({ #d121c0bd: 188 }, { #c1127ea9: 25 })>,
+        <#d3d219f7: ({ #d121c0bd: 189 }, { #c1127ea9: 25 })>,
         <#26796f6a:
-           ({ #d121c0bd: 189 }, { #f9c96be9: { #c1127ea9: 113 } }, { })>,
+           ({ #d121c0bd: 190 }, { #f9c96be9: { #c1127ea9: 113 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 37 },
             { #f9c96be9: { #c1127ea9: 8 } },
@@ -2798,11 +2799,11 @@
         <#d3d219f7: ({ #d121c0bd: 58 }, { #c1127ea9: 37 })>,
         <#0b08cd60: ({ #d121c0bd: 34 }, { #c1127ea9: 25, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 190 },
+           ({ #d121c0bd: 191 },
             { #f9c96be9: { #c1127ea9: 113 } },
             { #08ec7593: [ { #c1127ea9: 34 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 191 },
+           ({ #d121c0bd: 192 },
             { #f9c96be9: { #c1127ea9: 113 } },
             { #08ec7593: [ { #c1127ea9: 34 } ] })>,
         <#d3d219f7: ({ #d121c0bd: 80 }, { #c1127ea9: 40 })>,
@@ -2811,14 +2812,14 @@
             { #f9c96be9: { #c1127ea9: 113 } },
             { #08ec7593: [ { #c1127ea9: 34 } ] })>,
         <#d3d219f7: ({ #d121c0bd: 97 }, { #c1127ea9: 20 })>,
-        <#0098a8c5: ({ #d121c0bd: 192 }, { #fcd148e8: 171 })>,
-        <#2e3d736c: ({ #d121c0bd: 193 }, { #c1127ea9: 192 })>,
+        <#0098a8c5: ({ #d121c0bd: 193 }, { #fcd148e8: 171 })>,
+        <#2e3d736c: ({ #d121c0bd: 194 }, { #c1127ea9: 193 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 194, #26f32be5: 193 },
-            { #0b680f7d: { #c1127ea9: 193 }, #c3687459: 195 })>,
+           ({ #d121c0bd: 195, #26f32be5: 194 },
+            { #0b680f7d: { #c1127ea9: 194 }, #c3687459: 196 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 112, #26f32be5: 193 },
-            { #0b680f7d: { #c1127ea9: 194 }, #c3687459: 111 })>,
+           ({ #d121c0bd: 112, #26f32be5: 194 },
+            { #0b680f7d: { #c1127ea9: 195 }, #c3687459: 111 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/friend.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/friend.cpp.exp
index 12c8f4e81..6d72e0e92 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/friend.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/friend.cpp.exp
@@ -63,7 +63,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 0 },
                   { },
-                  "8348715085918813141",
+                  "",
                   {
                     #e43971cf: 7,
                     #0de52551: [ <#37e21eda: { #c1127ea9: 10 }> ]
@@ -154,7 +154,7 @@
                         { #c8ff724b: "Y", #2cdb06fb: [ "Y", "Y<int>" ] },
                         { #c1127ea9: 20 },
                         {
-                          #d2e9b40c: "17039860285578718334",
+                          #d2e9b40c: "15291750046890212067",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #ebe3c415: 19,
@@ -179,7 +179,7 @@
                         { #c8ff724b: "Y", #2cdb06fb: [ "Y", "Y<int>" ] },
                         { #c1127ea9: 23 },
                         {
-                          #d2e9b40c: "10269173081916450237",
+                          #d2e9b40c: "225939024662492936",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -206,7 +206,7 @@
                         { #c8ff724b: "Y", #2cdb06fb: [ "Y", "Y<int>" ] },
                         { #c1127ea9: 27 },
                         {
-                          #d2e9b40c: "15856009432989426751",
+                          #d2e9b40c: "11375010590039767716",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -227,7 +227,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 12, #1a9a7e84: true },
                   { #f1ae3b70: true },
-                  "12207844931495093295",
+                  "",
                   {
                     #e43971cf: 11,
                     #0de52551: [ <#37e21eda: { #c1127ea9: 30 }> ]
@@ -346,50 +346,51 @@
         <#d3d219f7: ({ #d121c0bd: 97 }, { #c1127ea9: 36 })>,
         <#22d546dd: ({ #d121c0bd: 98 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 99 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 100 }, 101)>,
-        <#d3d219f7: ({ #d121c0bd: 102 }, { #c1127ea9: 30, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 38, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 104 }, { #c1127ea9: 38 })>,
-        <#d80cb60b: ({ #d121c0bd: 105 }, 106)>,
+        <#22d546dd: ({ #d121c0bd: 100 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 101 }, 102)>,
+        <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 30, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 104 }, { #c1127ea9: 38, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 105 }, { #c1127ea9: 38 })>,
+        <#d80cb60b: ({ #d121c0bd: 106 }, 107)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 107 },
-            { #cd26765d: { #c1127ea9: 105 }, #11302019: 24 },
+           ({ #d121c0bd: 108 },
+            { #cd26765d: { #c1127ea9: 106 }, #11302019: 24 },
             1)>,
-        <#f3f3711a: ({ #d121c0bd: 108 })>,
         <#f3f3711a: ({ #d121c0bd: 109 })>,
-        <#ece2635f: ({ #d121c0bd: 110 })>,
+        <#f3f3711a: ({ #d121c0bd: 110 })>,
         <#ece2635f: ({ #d121c0bd: 111 })>,
-        <#d49f978d: ({ #d121c0bd: 112 })>,
-        <#f3f3711a: ({ #d121c0bd: 113 })>,
-        <#ece2635f: ({ #d121c0bd: 114 })>,
+        <#ece2635f: ({ #d121c0bd: 112 })>,
+        <#d49f978d: ({ #d121c0bd: 113 })>,
+        <#f3f3711a: ({ #d121c0bd: 114 })>,
         <#ece2635f: ({ #d121c0bd: 115 })>,
-        <#d49f978d: ({ #d121c0bd: 116 })>,
-        <#d3d219f7: ({ #d121c0bd: 117 }, { #c1127ea9: 108 })>,
-        <#d3d219f7: ({ #d121c0bd: 118 }, { #c1127ea9: 113 })>,
-        <#ece2635f: ({ #d121c0bd: 119 })>,
+        <#ece2635f: ({ #d121c0bd: 116 })>,
+        <#d49f978d: ({ #d121c0bd: 117 })>,
+        <#d3d219f7: ({ #d121c0bd: 118 }, { #c1127ea9: 109 })>,
+        <#d3d219f7: ({ #d121c0bd: 119 }, { #c1127ea9: 114 })>,
         <#ece2635f: ({ #d121c0bd: 120 })>,
-        <#263b5f37: ({ #d121c0bd: 121, #26f32be5: 120 })>,
-        <#f3f3711a: ({ #d121c0bd: 122 })>,
+        <#ece2635f: ({ #d121c0bd: 121 })>,
+        <#263b5f37: ({ #d121c0bd: 122, #26f32be5: 121 })>,
         <#f3f3711a: ({ #d121c0bd: 123 })>,
-        <#ece2635f: ({ #d121c0bd: 124 })>,
+        <#f3f3711a: ({ #d121c0bd: 124 })>,
         <#ece2635f: ({ #d121c0bd: 125 })>,
-        <#d49f978d: ({ #d121c0bd: 126 })>,
+        <#ece2635f: ({ #d121c0bd: 126 })>,
+        <#d49f978d: ({ #d121c0bd: 127 })>,
         <#d80cb60b: ({ #d121c0bd: 13 }, 12)>,
         <#ece2635f: ({ #d121c0bd: 32, #26f32be5: 13 })>,
-        <#dd64b59b: ({ #d121c0bd: 127, #26f32be5: 30 })>,
+        <#dd64b59b: ({ #d121c0bd: 128, #26f32be5: 30 })>,
         <#d3d219f7: ({ #d121c0bd: 10 }, { #c1127ea9: 30 })>,
-        <#d3d219f7: ({ #d121c0bd: 128 }, { #c1127ea9: 127 })>,
+        <#d3d219f7: ({ #d121c0bd: 129 }, { #c1127ea9: 128 })>,
         <#d80cb60b: ({ #d121c0bd: 9 }, 8)>,
-        <#ece2635f: ({ #d121c0bd: 129, #26f32be5: 9 })>,
+        <#ece2635f: ({ #d121c0bd: 130, #26f32be5: 9 })>,
         <#263b5f37: ({ #d121c0bd: 16, #26f32be5: 9 })>,
-        <#f3f3711a: ({ #d121c0bd: 130 })>,
-        <#26796f6a:
-           ({ #d121c0bd: 131 }, { #f9c96be9: { #c1127ea9: 36 } }, { })>,
+        <#f3f3711a: ({ #d121c0bd: 131 })>,
         <#26796f6a:
            ({ #d121c0bd: 132 }, { #f9c96be9: { #c1127ea9: 36 } }, { })>,
+        <#26796f6a:
+           ({ #d121c0bd: 133 }, { #f9c96be9: { #c1127ea9: 36 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 25 }, { #c1127ea9: 13, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 133 },
+           ({ #d121c0bd: 134 },
             { #f9c96be9: { #c1127ea9: 36 } },
             { #08ec7593: [ { #c1127ea9: 25 } ] })>,
         <#26796f6a:
@@ -398,7 +399,7 @@
             { #08ec7593: [ { #c1127ea9: 25 } ] })>,
         <#295746e6: ({ #d121c0bd: 29 }, { #c1127ea9: 13 })>,
         <#26796f6a:
-           ({ #d121c0bd: 134 },
+           ({ #d121c0bd: 135 },
             { #f9c96be9: { #c1127ea9: 36 } },
             { #08ec7593: [ { #c1127ea9: 29 } ] })>,
         <#26796f6a:
@@ -407,14 +408,14 @@
             { #08ec7593: [ { #c1127ea9: 29 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 20 }, { #f9c96be9: { #c1127ea9: 36 } }, { })>,
-        <#0098a8c5: ({ #d121c0bd: 135 }, { #fcd148e8: 94 })>,
-        <#2e3d736c: ({ #d121c0bd: 136 }, { #c1127ea9: 135 })>,
+        <#0098a8c5: ({ #d121c0bd: 136 }, { #fcd148e8: 94 })>,
+        <#2e3d736c: ({ #d121c0bd: 137 }, { #c1127ea9: 136 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 137, #26f32be5: 136 },
-            { #0b680f7d: { #c1127ea9: 136 }, #c3687459: 138 })>,
+           ({ #d121c0bd: 138, #26f32be5: 137 },
+            { #0b680f7d: { #c1127ea9: 137 }, #c3687459: 139 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 35, #26f32be5: 136 },
-            { #0b680f7d: { #c1127ea9: 137 }, #c3687459: 34 })>,
+           ({ #d121c0bd: 35, #26f32be5: 137 },
+            { #0b680f7d: { #c1127ea9: 138 }, #c3687459: 34 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/function_template.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/function_template.cpp.exp
index d2855cf7f..6301a3d72 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/function_template.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/function_template.cpp.exp
@@ -811,36 +811,37 @@
         <#d3d219f7: ({ #d121c0bd: 128 }, { #c1127ea9: 70 })>,
         <#22d546dd: ({ #d121c0bd: 129 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 130 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 131 }, 132)>,
-        <#d3d219f7: ({ #d121c0bd: 133 }, { #c1127ea9: 38, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 134 }, { #c1127ea9: 25, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 135 }, { #c1127ea9: 25 })>,
-        <#d80cb60b: ({ #d121c0bd: 136 }, 137)>,
+        <#22d546dd: ({ #d121c0bd: 131 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 132 }, 133)>,
+        <#d3d219f7: ({ #d121c0bd: 134 }, { #c1127ea9: 38, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 135 }, { #c1127ea9: 25, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 136 }, { #c1127ea9: 25 })>,
+        <#d80cb60b: ({ #d121c0bd: 137 }, 138)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 138 },
-            { #cd26765d: { #c1127ea9: 136 }, #11302019: 24 },
+           ({ #d121c0bd: 139 },
+            { #cd26765d: { #c1127ea9: 137 }, #11302019: 24 },
             1)>,
-        <#f3f3711a: ({ #d121c0bd: 139 })>,
         <#f3f3711a: ({ #d121c0bd: 140 })>,
-        <#26796f6a:
-           ({ #d121c0bd: 141 },
-            { #f9c96be9: { #c1127ea9: 139 } },
-            { #08ec7593: [ { #c1127ea9: 139 } ] })>,
+        <#f3f3711a: ({ #d121c0bd: 141 })>,
         <#26796f6a:
            ({ #d121c0bd: 142 },
             { #f9c96be9: { #c1127ea9: 140 } },
             { #08ec7593: [ { #c1127ea9: 140 } ] })>,
+        <#26796f6a:
+           ({ #d121c0bd: 143 },
+            { #f9c96be9: { #c1127ea9: 141 } },
+            { #08ec7593: [ { #c1127ea9: 141 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 36 },
             { #f9c96be9: { #c1127ea9: 38 } },
             { #08ec7593: [ { #c1127ea9: 38 } ] })>,
-        <#dd64b59b: ({ #d121c0bd: 143, #26f32be5: 38 })>,
-        <#26796f6a:
-           ({ #d121c0bd: 144 },
-            { #f9c96be9: { #c1127ea9: 143 } },
-            { #08ec7593: [ { #c1127ea9: 143 } ] })>,
+        <#dd64b59b: ({ #d121c0bd: 144, #26f32be5: 38 })>,
         <#26796f6a:
            ({ #d121c0bd: 145 },
+            { #f9c96be9: { #c1127ea9: 144 } },
+            { #08ec7593: [ { #c1127ea9: 144 } ] })>,
+        <#26796f6a:
+           ({ #d121c0bd: 146 },
             { #f9c96be9: { #c1127ea9: 16 } },
             { #08ec7593: [ { #c1127ea9: 16 } ] })>,
         <#dd64b59b: ({ #d121c0bd: 11, #26f32be5: 16 })>,
@@ -852,34 +853,34 @@
            ({ #d121c0bd: 46 }, { #f9c96be9: { #c1127ea9: 70 } }, { })>,
         <#dd64b59b: ({ #d121c0bd: 20, #26f32be5: 25 })>,
         <#26796f6a:
-           ({ #d121c0bd: 146 },
+           ({ #d121c0bd: 147 },
             { #f9c96be9: { #c1127ea9: 25 } },
             { #08ec7593: [ { #c1127ea9: 25 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 18 },
             { #f9c96be9: { #c1127ea9: 20 } },
             { #08ec7593: [ { #c1127ea9: 20 } ] })>,
-        <#d3d219f7: ({ #d121c0bd: 147 }, { #c1127ea9: 146 })>,
+        <#d3d219f7: ({ #d121c0bd: 148 }, { #c1127ea9: 147 })>,
         <#d3d219f7: ({ #d121c0bd: 57 }, { #c1127ea9: 18 })>,
         <#dd64b59b: ({ #d121c0bd: 29, #26f32be5: 34 })>,
         <#26796f6a:
-           ({ #d121c0bd: 148 },
+           ({ #d121c0bd: 149 },
             { #f9c96be9: { #c1127ea9: 34 } },
             { #08ec7593: [ { #c1127ea9: 34 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 27 },
             { #f9c96be9: { #c1127ea9: 29 } },
             { #08ec7593: [ { #c1127ea9: 29 } ] })>,
-        <#d3d219f7: ({ #d121c0bd: 149 }, { #c1127ea9: 148 })>,
+        <#d3d219f7: ({ #d121c0bd: 150 }, { #c1127ea9: 149 })>,
         <#d3d219f7: ({ #d121c0bd: 65 }, { #c1127ea9: 27 })>,
-        <#0098a8c5: ({ #d121c0bd: 150 }, { #fcd148e8: 125 })>,
-        <#2e3d736c: ({ #d121c0bd: 151 }, { #c1127ea9: 150 })>,
+        <#0098a8c5: ({ #d121c0bd: 151 }, { #fcd148e8: 125 })>,
+        <#2e3d736c: ({ #d121c0bd: 152 }, { #c1127ea9: 151 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 152, #26f32be5: 151 },
-            { #0b680f7d: { #c1127ea9: 151 }, #c3687459: 153 })>,
+           ({ #d121c0bd: 153, #26f32be5: 152 },
+            { #0b680f7d: { #c1127ea9: 152 }, #c3687459: 154 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 69, #26f32be5: 151 },
-            { #0b680f7d: { #c1127ea9: 152 }, #c3687459: 68 })>,
+           ({ #d121c0bd: 69, #26f32be5: 152 },
+            { #0b680f7d: { #c1127ea9: 153 }, #c3687459: 68 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/generic_selector_expression.c.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/generic_selector_expression.c.exp
index cb619f7f5..4a3b8287f 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/generic_selector_expression.c.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/generic_selector_expression.c.exp
@@ -874,24 +874,25 @@
         <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 45 })>,
         <#22d546dd: ({ #d121c0bd: 104 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 105 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 106 }, 107)>,
-        <#d3d219f7: ({ #d121c0bd: 108 }, { #c1127ea9: 15, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 109 }, { #c1127ea9: 12, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 110 }, { #c1127ea9: 12 })>,
-        <#d80cb60b: ({ #d121c0bd: 111 }, 112)>,
+        <#22d546dd: ({ #d121c0bd: 106 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 107 }, 108)>,
+        <#d3d219f7: ({ #d121c0bd: 109 }, { #c1127ea9: 15, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 110 }, { #c1127ea9: 12, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 111 }, { #c1127ea9: 12 })>,
+        <#d80cb60b: ({ #d121c0bd: 112 }, 113)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 113 },
-            { #cd26765d: { #c1127ea9: 111 }, #11302019: 24 },
+           ({ #d121c0bd: 114 },
+            { #cd26765d: { #c1127ea9: 112 }, #11302019: 24 },
             1)>,
         <#26796f6a: ({ #d121c0bd: 8 }, { #f9c96be9: { #c1127ea9: 15 } }, { })>,
-        <#0098a8c5: ({ #d121c0bd: 114 }, { #fcd148e8: 100 })>,
-        <#2e3d736c: ({ #d121c0bd: 115 }, { #c1127ea9: 114 })>,
+        <#0098a8c5: ({ #d121c0bd: 115 }, { #fcd148e8: 100 })>,
+        <#2e3d736c: ({ #d121c0bd: 116 }, { #c1127ea9: 115 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 116, #26f32be5: 115 },
-            { #0b680f7d: { #c1127ea9: 115 }, #c3687459: 117 })>,
+           ({ #d121c0bd: 117, #26f32be5: 116 },
+            { #0b680f7d: { #c1127ea9: 116 }, #c3687459: 118 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 44, #26f32be5: 115 },
-            { #0b680f7d: { #c1127ea9: 116 }, #c3687459: 43 })>,
+           ({ #d121c0bd: 44, #26f32be5: 116 },
+            { #0b680f7d: { #c1127ea9: 117 }, #c3687459: 43 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheritance.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheritance.cpp.exp
index b81f9cbc8..e2c013287 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheritance.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheritance.cpp.exp
@@ -463,7 +463,7 @@
                 { #c8ff724b: "~Form", #2cdb06fb: [ "~Form", "Form" ] },
                 { #c1127ea9: 52 },
                 {
-                  #d2e9b40c: "7469005664164565375",
+                  #d2e9b40c: "8602613147659843985",
                   #f1a45f0e: true,
                   #3e64314e: true
                 },
@@ -1474,7 +1474,7 @@
                 { #c8ff724b: "~Circle", #2cdb06fb: [ "~Circle", "Circle" ] },
                 { #c1127ea9: 125 },
                 {
-                  #d2e9b40c: "4580501627556196443",
+                  #d2e9b40c: "5821333485013418573",
                   #f1a45f0e: true,
                   #3e64314e: true
                 },
@@ -1578,14 +1578,15 @@
         <#d3d219f7: ({ #d121c0bd: 185 }, { #c1127ea9: 103 })>,
         <#22d546dd: ({ #d121c0bd: 186 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 187 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 188 }, 189)>,
-        <#d3d219f7: ({ #d121c0bd: 190 }, { #c1127ea9: 22, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 191 }, { #c1127ea9: 128, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 192 }, { #c1127ea9: 128 })>,
-        <#d80cb60b: ({ #d121c0bd: 193 }, 194)>,
+        <#22d546dd: ({ #d121c0bd: 188 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 189 }, 190)>,
+        <#d3d219f7: ({ #d121c0bd: 191 }, { #c1127ea9: 22, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 192 }, { #c1127ea9: 128, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 193 }, { #c1127ea9: 128 })>,
+        <#d80cb60b: ({ #d121c0bd: 194 }, 195)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 195 },
-            { #cd26765d: { #c1127ea9: 193 }, #11302019: 24 },
+           ({ #d121c0bd: 196 },
+            { #cd26765d: { #c1127ea9: 194 }, #11302019: 24 },
             1)>,
         <#26796f6a:
            ({ #d121c0bd: 8 },
@@ -1605,24 +1606,24 @@
            ({ #d121c0bd: 35 },
             { #f9c96be9: { #c1127ea9: 103 } },
             { #08ec7593: [ { #c1127ea9: 10 } ] })>,
-        <#0b08cd60: ({ #d121c0bd: 196 }, { #c1127ea9: 16 })>,
+        <#0b08cd60: ({ #d121c0bd: 197 }, { #c1127ea9: 16 })>,
         <#0b08cd60: ({ #d121c0bd: 46 }, { #c1127ea9: 16, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 197 },
-            { #f9c96be9: { #c1127ea9: 196 } },
+           ({ #d121c0bd: 198 },
+            { #f9c96be9: { #c1127ea9: 197 } },
             { #08ec7593: [ { #c1127ea9: 46 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 44 },
-            { #f9c96be9: { #c1127ea9: 196 } },
+            { #f9c96be9: { #c1127ea9: 197 } },
             { #08ec7593: [ { #c1127ea9: 46 } ] })>,
         <#295746e6: ({ #d121c0bd: 50 }, { #c1127ea9: 16 })>,
         <#26796f6a:
-           ({ #d121c0bd: 198 },
-            { #f9c96be9: { #c1127ea9: 196 } },
+           ({ #d121c0bd: 199 },
+            { #f9c96be9: { #c1127ea9: 197 } },
             { #08ec7593: [ { #c1127ea9: 50 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 48 },
-            { #f9c96be9: { #c1127ea9: 196 } },
+            { #f9c96be9: { #c1127ea9: 197 } },
             { #08ec7593: [ { #c1127ea9: 50 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 52 }, { #f9c96be9: { #c1127ea9: 103 } }, { })>,
@@ -1630,37 +1631,37 @@
         <#d3d219f7: ({ #d121c0bd: 70 }, { #c1127ea9: 54 })>,
         <#26796f6a:
            ({ #d121c0bd: 105 }, { #f9c96be9: { #c1127ea9: 115 } }, { })>,
-        <#0b08cd60: ({ #d121c0bd: 199 }, { #c1127ea9: 54 })>,
+        <#0b08cd60: ({ #d121c0bd: 200 }, { #c1127ea9: 54 })>,
         <#0b08cd60: ({ #d121c0bd: 119 }, { #c1127ea9: 54, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 200 },
-            { #f9c96be9: { #c1127ea9: 199 } },
+           ({ #d121c0bd: 201 },
+            { #f9c96be9: { #c1127ea9: 200 } },
             { #08ec7593: [ { #c1127ea9: 119 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 117 },
-            { #f9c96be9: { #c1127ea9: 199 } },
+            { #f9c96be9: { #c1127ea9: 200 } },
             { #08ec7593: [ { #c1127ea9: 119 } ] })>,
         <#295746e6: ({ #d121c0bd: 123 }, { #c1127ea9: 54 })>,
         <#26796f6a:
-           ({ #d121c0bd: 201 },
-            { #f9c96be9: { #c1127ea9: 199 } },
+           ({ #d121c0bd: 202 },
+            { #f9c96be9: { #c1127ea9: 200 } },
             { #08ec7593: [ { #c1127ea9: 123 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 121 },
-            { #f9c96be9: { #c1127ea9: 199 } },
+            { #f9c96be9: { #c1127ea9: 200 } },
             { #08ec7593: [ { #c1127ea9: 123 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 125 }, { #f9c96be9: { #c1127ea9: 103 } }, { })>,
         <#d3d219f7: ({ #d121c0bd: 76 }, { #c1127ea9: 8 })>,
         <#d3d219f7: ({ #d121c0bd: 95 }, { #c1127ea9: 12 })>,
-        <#0098a8c5: ({ #d121c0bd: 202 }, { #fcd148e8: 182 })>,
-        <#2e3d736c: ({ #d121c0bd: 203 }, { #c1127ea9: 202 })>,
+        <#0098a8c5: ({ #d121c0bd: 203 }, { #fcd148e8: 182 })>,
+        <#2e3d736c: ({ #d121c0bd: 204 }, { #c1127ea9: 203 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 204, #26f32be5: 203 },
-            { #0b680f7d: { #c1127ea9: 203 }, #c3687459: 205 })>,
+           ({ #d121c0bd: 205, #26f32be5: 204 },
+            { #0b680f7d: { #c1127ea9: 204 }, #c3687459: 206 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 127, #26f32be5: 203 },
-            { #0b680f7d: { #c1127ea9: 204 }, #c3687459: 126 })>,
+           ({ #d121c0bd: 127, #26f32be5: 204 },
+            { #0b680f7d: { #c1127ea9: 205 }, #c3687459: 126 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheriting_constructor.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheriting_constructor.cpp.exp
index e76933ee4..f9d956916 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheriting_constructor.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheriting_constructor.cpp.exp
@@ -81,7 +81,7 @@
                 { #c8ff724b: "A", #2cdb06fb: [ "A", "A" ] },
                 { #c1127ea9: 11 },
                 {
-                  #d2e9b40c: "14779048587651412014",
+                  #d2e9b40c: "16649826940628685907",
                   #f1a45f0e: true,
                   #d17ebeaa: [
                     <#fd75cc45:
@@ -138,7 +138,7 @@
                 { #c8ff724b: "A", #2cdb06fb: [ "A", "A" ] },
                 { #c1127ea9: 19 },
                 {
-                  #d2e9b40c: "3430056695640597274",
+                  #d2e9b40c: "6367731417382615745",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -164,7 +164,7 @@
                 { #c8ff724b: "A", #2cdb06fb: [ "A", "A" ] },
                 { #c1127ea9: 23 },
                 {
-                  #d2e9b40c: "1361265890968139694",
+                  #d2e9b40c: "17956886967408801671",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -190,7 +190,7 @@
                 { #c8ff724b: "~A", #2cdb06fb: [ "~A", "A" ] },
                 { #c1127ea9: 27 },
                 {
-                  #d2e9b40c: "5328378654181921475",
+                  #d2e9b40c: "6691652126532499765",
                   #f1a45f0e: true,
                   #3e64314e: true
                 },
@@ -279,7 +279,7 @@
                 { #c8ff724b: "B", #2cdb06fb: [ "B", "B" ] },
                 { #c1127ea9: 36 },
                 {
-                  #d2e9b40c: "10798876524598897542",
+                  #d2e9b40c: "8928078380412315851",
                   #f1a45f0e: true,
                   #3e64314e: true
                 },
@@ -295,7 +295,7 @@
                 { #c8ff724b: "B", #2cdb06fb: [ "B", "B" ] },
                 { #c1127ea9: 38 },
                 {
-                  #d2e9b40c: "7710293714478488613",
+                  #d2e9b40c: "6925252787601137710",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -321,7 +321,7 @@
                 { #c8ff724b: "B", #2cdb06fb: [ "B", "B" ] },
                 { #c1127ea9: 42 },
                 {
-                  #d2e9b40c: "16903082029399050859",
+                  #d2e9b40c: "17350102287109130674",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -350,7 +350,7 @@
                 { #c8ff724b: "A", #2cdb06fb: [ "A", "B" ] },
                 { #c1127ea9: 46 },
                 {
-                  #d2e9b40c: "18258347749069050656",
+                  #d2e9b40c: "5352909623164416057",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -596,17 +596,18 @@
         <#d3d219f7: ({ #d121c0bd: 120 }, { #c1127ea9: 59 })>,
         <#22d546dd: ({ #d121c0bd: 121 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 122 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 123 }, 124)>,
-        <#d3d219f7: ({ #d121c0bd: 125 }, { #c1127ea9: 13, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 126 }, { #c1127ea9: 61, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 127 }, { #c1127ea9: 61 })>,
-        <#d80cb60b: ({ #d121c0bd: 128 }, 129)>,
+        <#22d546dd: ({ #d121c0bd: 123 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 124 }, 125)>,
+        <#d3d219f7: ({ #d121c0bd: 126 }, { #c1127ea9: 13, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 127 }, { #c1127ea9: 61, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 128 }, { #c1127ea9: 61 })>,
+        <#d80cb60b: ({ #d121c0bd: 129 }, 130)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 130 },
-            { #cd26765d: { #c1127ea9: 128 }, #11302019: 24 },
+           ({ #d121c0bd: 131 },
+            { #cd26765d: { #c1127ea9: 129 }, #11302019: 24 },
             1)>,
         <#d80cb60b: ({ #d121c0bd: 8 }, 7)>,
-        <#d3d219f7: ({ #d121c0bd: 131 }, { #c1127ea9: 8 })>,
+        <#d3d219f7: ({ #d121c0bd: 132 }, { #c1127ea9: 8 })>,
         <#26796f6a:
            ({ #d121c0bd: 11 },
             { #f9c96be9: { #c1127ea9: 59 } },
@@ -616,7 +617,7 @@
         <#d80cb60b: ({ #d121c0bd: 29 }, 28)>,
         <#0b08cd60: ({ #d121c0bd: 21 }, { #c1127ea9: 8, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 132 },
+           ({ #d121c0bd: 133 },
             { #f9c96be9: { #c1127ea9: 59 } },
             { #08ec7593: [ { #c1127ea9: 21 } ] })>,
         <#26796f6a:
@@ -625,7 +626,7 @@
             { #08ec7593: [ { #c1127ea9: 21 } ] })>,
         <#295746e6: ({ #d121c0bd: 25 }, { #c1127ea9: 8 })>,
         <#26796f6a:
-           ({ #d121c0bd: 133 },
+           ({ #d121c0bd: 134 },
             { #f9c96be9: { #c1127ea9: 59 } },
             { #08ec7593: [ { #c1127ea9: 25 } ] })>,
         <#26796f6a:
@@ -636,7 +637,7 @@
            ({ #d121c0bd: 36 }, { #f9c96be9: { #c1127ea9: 59 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 40 }, { #c1127ea9: 29, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 134 },
+           ({ #d121c0bd: 135 },
             { #f9c96be9: { #c1127ea9: 59 } },
             { #08ec7593: [ { #c1127ea9: 40 } ] })>,
         <#26796f6a:
@@ -647,7 +648,7 @@
            ({ #d121c0bd: 27 }, { #f9c96be9: { #c1127ea9: 59 } }, { })>,
         <#295746e6: ({ #d121c0bd: 44 }, { #c1127ea9: 29 })>,
         <#26796f6a:
-           ({ #d121c0bd: 135 },
+           ({ #d121c0bd: 136 },
             { #f9c96be9: { #c1127ea9: 59 } },
             { #08ec7593: [ { #c1127ea9: 44 } ] })>,
         <#26796f6a:
@@ -656,23 +657,23 @@
             { #08ec7593: [ { #c1127ea9: 44 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 51 }, { #f9c96be9: { #c1127ea9: 13 } }, { })>,
-        <#d3d219f7: ({ #d121c0bd: 136 }, { #c1127ea9: 127 })>,
+        <#d3d219f7: ({ #d121c0bd: 137 }, { #c1127ea9: 128 })>,
         <#26796f6a:
-           ({ #d121c0bd: 137 },
+           ({ #d121c0bd: 138 },
             { #f9c96be9: { #c1127ea9: 59 } },
             { #08ec7593: [ { #c1127ea9: 13 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 46 },
             { #f9c96be9: { #c1127ea9: 59 } },
             { #08ec7593: [ { #c1127ea9: 13 } ] })>,
-        <#0098a8c5: ({ #d121c0bd: 138 }, { #fcd148e8: 117 })>,
-        <#2e3d736c: ({ #d121c0bd: 139 }, { #c1127ea9: 138 })>,
+        <#0098a8c5: ({ #d121c0bd: 139 }, { #fcd148e8: 117 })>,
+        <#2e3d736c: ({ #d121c0bd: 140 }, { #c1127ea9: 139 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 140, #26f32be5: 139 },
-            { #0b680f7d: { #c1127ea9: 139 }, #c3687459: 141 })>,
+           ({ #d121c0bd: 141, #26f32be5: 140 },
+            { #0b680f7d: { #c1127ea9: 140 }, #c3687459: 142 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 58, #26f32be5: 139 },
-            { #0b680f7d: { #c1127ea9: 140 }, #c3687459: 57 })>,
+           ({ #d121c0bd: 58, #26f32be5: 140 },
+            { #0b680f7d: { #c1127ea9: 141 }, #c3687459: 57 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/lambda.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/lambda.cpp.exp
index 4aabd44a4..47d767717 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/lambda.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/lambda.cpp.exp
@@ -431,7 +431,7 @@
                                                               },
                                                               {
                                                                 #d2e9b40c:
-                                                                  "11922868141377072075",
+                                                                  "13286141613727650365",
                                                                 #f1a45f0e:
                                                                   true,
                                                                 #3e64314e:
@@ -469,7 +469,7 @@
                                                               },
                                                               {
                                                                 #d2e9b40c:
-                                                                  "11530695906998885266",
+                                                                  "10693628329110131385",
                                                                 #f1a45f0e:
                                                                   true,
                                                                 #3e64314e:
@@ -547,7 +547,7 @@
                                                               },
                                                               {
                                                                 #d2e9b40c:
-                                                                  "12828931072019093462",
+                                                                  "18362977156530360911",
                                                                 #f1a45f0e:
                                                                   true,
                                                                 #3e64314e:
@@ -1069,7 +1069,7 @@
                                                                    },
                                                                    {
                                                                     #d2e9b40c:
-                                                                    "11922868141377072075",
+                                                                    "13286141613727650365",
                                                                     #f1a45f0e:
                                                                     true,
                                                                     #3e64314e:
@@ -1113,7 +1113,7 @@
                                                                    },
                                                                    {
                                                                     #d2e9b40c:
-                                                                    "11530695906998885266",
+                                                                    "10693628329110131385",
                                                                     #f1a45f0e:
                                                                     true,
                                                                     #3e64314e:
@@ -1196,7 +1196,7 @@
                                                                    },
                                                                    {
                                                                     #d2e9b40c:
-                                                                    "12828931072019093462",
+                                                                    "18362977156530360911",
                                                                     #f1a45f0e:
                                                                     true,
                                                                     #3e64314e:
@@ -1874,7 +1874,7 @@
                                                               },
                                                               {
                                                                 #d2e9b40c:
-                                                                  "16202408192376244884",
+                                                                  "17450839874206147646",
                                                                 #f1a45f0e:
                                                                   true,
                                                                 #3e64314e:
@@ -1912,7 +1912,7 @@
                                                               },
                                                               {
                                                                 #d2e9b40c:
-                                                                  "9965911517403679447",
+                                                                  "34143097794571044",
                                                                 #f1a45f0e:
                                                                   true,
                                                                 #3e64314e:
@@ -1990,7 +1990,7 @@
                                                               },
                                                               {
                                                                 #d2e9b40c:
-                                                                  "8193408137476215445",
+                                                                  "4775778177696808400",
                                                                 #f1a45f0e:
                                                                   true,
                                                                 #3e64314e:
@@ -3162,7 +3162,7 @@
                                                                    },
                                                                    {
                                                                     #d2e9b40c:
-                                                                    "16202408192376244884",
+                                                                    "17450839874206147646",
                                                                     #f1a45f0e:
                                                                     true,
                                                                     #3e64314e:
@@ -3206,7 +3206,7 @@
                                                                    },
                                                                    {
                                                                     #d2e9b40c:
-                                                                    "9965911517403679447",
+                                                                    "34143097794571044",
                                                                     #f1a45f0e:
                                                                     true,
                                                                     #3e64314e:
@@ -3289,7 +3289,7 @@
                                                                    },
                                                                    {
                                                                     #d2e9b40c:
-                                                                    "8193408137476215445",
+                                                                    "4775778177696808400",
                                                                     #f1a45f0e:
                                                                     true,
                                                                     #3e64314e:
@@ -4281,7 +4281,7 @@
                                                               },
                                                               {
                                                                 #d2e9b40c:
-                                                                  "17098733838812833493",
+                                                                  "15857901981355611363",
                                                                 #f1a45f0e:
                                                                   true,
                                                                 #3e64314e:
@@ -4320,7 +4320,7 @@
                                                               },
                                                               {
                                                                 #d2e9b40c:
-                                                                  "14201972727608021968",
+                                                                  "7938324828555278899",
                                                                 #f1a45f0e:
                                                                   true,
                                                                 #3e64314e:
@@ -4400,7 +4400,7 @@
                                                               },
                                                               {
                                                                 #d2e9b40c:
-                                                                  "3001717133787422796",
+                                                                  "4960955440766632321",
                                                                 #f1a45f0e:
                                                                   true,
                                                                 #3e64314e:
@@ -5291,7 +5291,7 @@
                                                                    },
                                                                    {
                                                                     #d2e9b40c:
-                                                                    "17098733838812833493",
+                                                                    "15857901981355611363",
                                                                     #f1a45f0e:
                                                                     true,
                                                                     #3e64314e:
@@ -5335,7 +5335,7 @@
                                                                    },
                                                                    {
                                                                     #d2e9b40c:
-                                                                    "14201972727608021968",
+                                                                    "7938324828555278899",
                                                                     #f1a45f0e:
                                                                     true,
                                                                     #3e64314e:
@@ -5418,7 +5418,7 @@
                                                                    },
                                                                    {
                                                                     #d2e9b40c:
-                                                                    "3001717133787422796",
+                                                                    "4960955440766632321",
                                                                     #f1a45f0e:
                                                                     true,
                                                                     #3e64314e:
@@ -5979,46 +5979,47 @@
         <#d3d219f7: ({ #d121c0bd: 179 }, { #c1127ea9: 118 })>,
         <#22d546dd: ({ #d121c0bd: 180 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 181 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 182 }, 183)>,
-        <#d3d219f7: ({ #d121c0bd: 184 }, { #c1127ea9: 12, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 185 }, { #c1127ea9: 120, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 186 }, { #c1127ea9: 120 })>,
-        <#d80cb60b: ({ #d121c0bd: 187 }, 188)>,
+        <#22d546dd: ({ #d121c0bd: 182 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 183 }, 184)>,
+        <#d3d219f7: ({ #d121c0bd: 185 }, { #c1127ea9: 12, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 186 }, { #c1127ea9: 120, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 187 }, { #c1127ea9: 120 })>,
+        <#d80cb60b: ({ #d121c0bd: 188 }, 189)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 189 },
-            { #cd26765d: { #c1127ea9: 187 }, #11302019: 24 },
+           ({ #d121c0bd: 190 },
+            { #cd26765d: { #c1127ea9: 188 }, #11302019: 24 },
             1)>,
         <#26796f6a: ({ #d121c0bd: 8 }, { #f9c96be9: { #c1127ea9: 12 } }, { })>,
-        <#d3d219f7: ({ #d121c0bd: 190 }, { #c1127ea9: 186 })>,
+        <#d3d219f7: ({ #d121c0bd: 191 }, { #c1127ea9: 187 })>,
         <#26796f6a:
-           ({ #d121c0bd: 191 }, { #f9c96be9: { #c1127ea9: 192 } }, { })>,
+           ({ #d121c0bd: 192 }, { #f9c96be9: { #c1127ea9: 193 } }, { })>,
         <#d80cb60b: ({ #d121c0bd: 22 }, 23)>,
-        <#f3f3711a: ({ #d121c0bd: 193 })>,
         <#f3f3711a: ({ #d121c0bd: 194 })>,
+        <#f3f3711a: ({ #d121c0bd: 195 })>,
         <#09e09de9: ({ #d121c0bd: 92, #26f32be5: 12 })>,
         <#26796f6a:
-           ({ #d121c0bd: 195 }, { #f9c96be9: { #c1127ea9: 12 } }, { })>,
+           ({ #d121c0bd: 196 }, { #f9c96be9: { #c1127ea9: 12 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 25 }, { #f9c96be9: { #c1127ea9: 92 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 29 }, { #f9c96be9: { #c1127ea9: 92 } }, { })>,
-        <#d3d219f7: ({ #d121c0bd: 196 }, { #c1127ea9: 8 })>,
-        <#d3d219f7: ({ #d121c0bd: 197 }, { #c1127ea9: 29 })>,
+        <#d3d219f7: ({ #d121c0bd: 197 }, { #c1127ea9: 8 })>,
+        <#d3d219f7: ({ #d121c0bd: 198 }, { #c1127ea9: 29 })>,
         <#26796f6a:
-           ({ #d121c0bd: 198 }, { #f9c96be9: { #c1127ea9: 196 } }, { })>,
+           ({ #d121c0bd: 199 }, { #f9c96be9: { #c1127ea9: 197 } }, { })>,
         <#26796f6a:
-           ({ #d121c0bd: 27 }, { #f9c96be9: { #c1127ea9: 197 } }, { })>,
-        <#26796f6a:
-           ({ #d121c0bd: 199 }, { #f9c96be9: { #c1127ea9: 118 } }, { })>,
+           ({ #d121c0bd: 27 }, { #f9c96be9: { #c1127ea9: 198 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 200 }, { #f9c96be9: { #c1127ea9: 118 } }, { })>,
+        <#26796f6a:
+           ({ #d121c0bd: 201 }, { #f9c96be9: { #c1127ea9: 118 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 31 }, { #f9c96be9: { #c1127ea9: 118 } }, { })>,
-        <#f3f3711a: ({ #d121c0bd: 201 })>,
+        <#f3f3711a: ({ #d121c0bd: 202 })>,
         <#09e09de9: ({ #d121c0bd: 41, #26f32be5: 22 })>,
         <#0b08cd60: ({ #d121c0bd: 35 }, { #c1127ea9: 22, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 202 },
+           ({ #d121c0bd: 203 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 35 } ] })>,
         <#26796f6a:
@@ -6027,11 +6028,11 @@
             { #08ec7593: [ { #c1127ea9: 35 } ] })>,
         <#295746e6: ({ #d121c0bd: 39 }, { #c1127ea9: 22 })>,
         <#26796f6a:
-           ({ #d121c0bd: 203 },
+           ({ #d121c0bd: 204 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 39 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 204 },
+           ({ #d121c0bd: 205 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 39 } ] })>,
         <#26796f6a:
@@ -6039,14 +6040,14 @@
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 39 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 205 },
-            { #f9c96be9: { #c1127ea9: 192 } },
+           ({ #d121c0bd: 206 },
+            { #f9c96be9: { #c1127ea9: 193 } },
             { #08ec7593: [ { #c1127ea9: 12 } ] })>,
         <#d80cb60b: ({ #d121c0bd: 55 }, 56)>,
         <#0b08cd60: ({ #d121c0bd: 61 }, { #c1127ea9: 12 })>,
-        <#f3f3711a: ({ #d121c0bd: 206 })>,
+        <#f3f3711a: ({ #d121c0bd: 207 })>,
         <#26796f6a:
-           ({ #d121c0bd: 207 },
+           ({ #d121c0bd: 208 },
             { #f9c96be9: { #c1127ea9: 12 } },
             { #08ec7593: [ { #c1127ea9: 12 } ] })>,
         <#26796f6a:
@@ -6054,12 +6055,12 @@
             { #f9c96be9: { #c1127ea9: 92 } },
             { #08ec7593: [ { #c1127ea9: 12 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 208 }, { #f9c96be9: { #c1127ea9: 118 } }, { })>,
-        <#f3f3711a: ({ #d121c0bd: 209 })>,
+           ({ #d121c0bd: 209 }, { #f9c96be9: { #c1127ea9: 118 } }, { })>,
+        <#f3f3711a: ({ #d121c0bd: 210 })>,
         <#09e09de9: ({ #d121c0bd: 80, #26f32be5: 55 })>,
         <#0b08cd60: ({ #d121c0bd: 67 }, { #c1127ea9: 55, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 210 },
+           ({ #d121c0bd: 211 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 67 } ] })>,
         <#26796f6a:
@@ -6068,27 +6069,27 @@
             { #08ec7593: [ { #c1127ea9: 67 } ] })>,
         <#295746e6: ({ #d121c0bd: 71 }, { #c1127ea9: 55 })>,
         <#26796f6a:
-           ({ #d121c0bd: 211 },
+           ({ #d121c0bd: 212 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 71 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 212 },
+           ({ #d121c0bd: 213 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 71 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 69 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 71 } ] })>,
-        <#f3f3711a: ({ #d121c0bd: 213 })>,
-        <#d80cb60b: ({ #d121c0bd: 94 }, 95)>,
         <#f3f3711a: ({ #d121c0bd: 214 })>,
+        <#d80cb60b: ({ #d121c0bd: 94 }, 95)>,
+        <#f3f3711a: ({ #d121c0bd: 215 })>,
         <#26796f6a:
-           ({ #d121c0bd: 215 }, { #f9c96be9: { #c1127ea9: 118 } }, { })>,
-        <#f3f3711a: ({ #d121c0bd: 216 })>,
+           ({ #d121c0bd: 216 }, { #f9c96be9: { #c1127ea9: 118 } }, { })>,
+        <#f3f3711a: ({ #d121c0bd: 217 })>,
         <#09e09de9: ({ #d121c0bd: 112, #26f32be5: 94 })>,
         <#0b08cd60: ({ #d121c0bd: 102 }, { #c1127ea9: 94, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 217 },
+           ({ #d121c0bd: 218 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 102 } ] })>,
         <#26796f6a:
@@ -6097,25 +6098,25 @@
             { #08ec7593: [ { #c1127ea9: 102 } ] })>,
         <#295746e6: ({ #d121c0bd: 106 }, { #c1127ea9: 94 })>,
         <#26796f6a:
-           ({ #d121c0bd: 218 },
+           ({ #d121c0bd: 219 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 106 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 219 },
+           ({ #d121c0bd: 220 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 106 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 104 },
             { #f9c96be9: { #c1127ea9: 118 } },
             { #08ec7593: [ { #c1127ea9: 106 } ] })>,
-        <#0098a8c5: ({ #d121c0bd: 220 }, { #fcd148e8: 176 })>,
-        <#2e3d736c: ({ #d121c0bd: 221 }, { #c1127ea9: 220 })>,
+        <#0098a8c5: ({ #d121c0bd: 221 }, { #fcd148e8: 176 })>,
+        <#2e3d736c: ({ #d121c0bd: 222 }, { #c1127ea9: 221 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 222, #26f32be5: 221 },
-            { #0b680f7d: { #c1127ea9: 221 }, #c3687459: 223 })>,
+           ({ #d121c0bd: 223, #26f32be5: 222 },
+            { #0b680f7d: { #c1127ea9: 222 }, #c3687459: 224 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 117, #26f32be5: 221 },
-            { #0b680f7d: { #c1127ea9: 222 }, #c3687459: 116 })>,
+           ({ #d121c0bd: 117, #26f32be5: 222 },
+            { #0b680f7d: { #c1127ea9: 223 }, #c3687459: 116 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/materialize_temporary.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/materialize_temporary.cpp.exp
index 8c6abb084..04ccc7b3d 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/materialize_temporary.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/materialize_temporary.cpp.exp
@@ -188,24 +188,25 @@
         <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 17 })>,
         <#22d546dd: ({ #d121c0bd: 78 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 79 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 80 }, 81)>,
-        <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 14, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 19, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 84 }, { #c1127ea9: 19 })>,
-        <#d80cb60b: ({ #d121c0bd: 85 }, 86)>,
+        <#22d546dd: ({ #d121c0bd: 80 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 81 }, 82)>,
+        <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 14, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 84 }, { #c1127ea9: 19, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 85 }, { #c1127ea9: 19 })>,
+        <#d80cb60b: ({ #d121c0bd: 86 }, 87)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 87 },
-            { #cd26765d: { #c1127ea9: 85 }, #11302019: 24 },
+           ({ #d121c0bd: 88 },
+            { #cd26765d: { #c1127ea9: 86 }, #11302019: 24 },
             1)>,
         <#0b08cd60: ({ #d121c0bd: 8 }, { #c1127ea9: 14, #ea1a680e: true })>,
-        <#0098a8c5: ({ #d121c0bd: 88 }, { #fcd148e8: 74 })>,
-        <#2e3d736c: ({ #d121c0bd: 89 }, { #c1127ea9: 88 })>,
+        <#0098a8c5: ({ #d121c0bd: 89 }, { #fcd148e8: 74 })>,
+        <#2e3d736c: ({ #d121c0bd: 90 }, { #c1127ea9: 89 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 90, #26f32be5: 89 },
-            { #0b680f7d: { #c1127ea9: 89 }, #c3687459: 91 })>,
+           ({ #d121c0bd: 91, #26f32be5: 90 },
+            { #0b680f7d: { #c1127ea9: 90 }, #c3687459: 92 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 16, #26f32be5: 89 },
-            { #0b680f7d: { #c1127ea9: 90 }, #c3687459: 15 })>,
+           ({ #d121c0bd: 16, #26f32be5: 90 },
+            { #0b680f7d: { #c1127ea9: 91 }, #c3687459: 15 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/namespace_decl.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/namespace_decl.cpp.exp
index 5d7b8fdc1..0ea05702e 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/namespace_decl.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/namespace_decl.cpp.exp
@@ -220,23 +220,24 @@
         <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 17 })>,
         <#22d546dd: ({ #d121c0bd: 79 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 80 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 81 }, 82)>,
-        <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 12, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 84 }, { #c1127ea9: 19, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 85 }, { #c1127ea9: 19 })>,
-        <#d80cb60b: ({ #d121c0bd: 86 }, 87)>,
+        <#22d546dd: ({ #d121c0bd: 81 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 82 }, 83)>,
+        <#d3d219f7: ({ #d121c0bd: 84 }, { #c1127ea9: 12, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 85 }, { #c1127ea9: 19, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 86 }, { #c1127ea9: 19 })>,
+        <#d80cb60b: ({ #d121c0bd: 87 }, 88)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 88 },
-            { #cd26765d: { #c1127ea9: 86 }, #11302019: 24 },
+           ({ #d121c0bd: 89 },
+            { #cd26765d: { #c1127ea9: 87 }, #11302019: 24 },
             1)>,
-        <#0098a8c5: ({ #d121c0bd: 89 }, { #fcd148e8: 75 })>,
-        <#2e3d736c: ({ #d121c0bd: 90 }, { #c1127ea9: 89 })>,
+        <#0098a8c5: ({ #d121c0bd: 90 }, { #fcd148e8: 75 })>,
+        <#2e3d736c: ({ #d121c0bd: 91 }, { #c1127ea9: 90 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 91, #26f32be5: 90 },
-            { #0b680f7d: { #c1127ea9: 90 }, #c3687459: 92 })>,
+           ({ #d121c0bd: 92, #26f32be5: 91 },
+            { #0b680f7d: { #c1127ea9: 91 }, #c3687459: 93 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 16, #26f32be5: 90 },
-            { #0b680f7d: { #c1127ea9: 91 }, #c3687459: 15 })>,
+           ({ #d121c0bd: 16, #26f32be5: 91 },
+            { #0b680f7d: { #c1127ea9: 92 }, #c3687459: 15 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/new.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/new.cpp.exp
index cdb3df6a2..0ff994a7e 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/new.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/new.cpp.exp
@@ -88,7 +88,7 @@
                 { #c8ff724b: "pod", #2cdb06fb: [ "pod", "pod" ] },
                 { #c1127ea9: 13 },
                 {
-                  #d2e9b40c: "8251339330154476193",
+                  #d2e9b40c: "7740115901201927888",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #ebe3c415: 12,
@@ -112,7 +112,7 @@
                 { #c8ff724b: "pod", #2cdb06fb: [ "pod", "pod" ] },
                 { #c1127ea9: 16 },
                 {
-                  #d2e9b40c: "14628250159452892772",
+                  #d2e9b40c: "12480848167264656407",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -138,7 +138,7 @@
                 { #c8ff724b: "pod", #2cdb06fb: [ "pod", "pod" ] },
                 { #c1127ea9: 20 },
                 {
-                  #d2e9b40c: "3036348191925830672",
+                  #d2e9b40c: "6070336924810484949",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -165,7 +165,7 @@
                 { #c8ff724b: "~pod", #2cdb06fb: [ "~pod", "pod" ] },
                 { #c1127ea9: 13 },
                 {
-                  #d2e9b40c: "6606037711693769625",
+                  #d2e9b40c: "5472746887547415783",
                   #f1a45f0e: true,
                   #3e64314e: true
                 },
@@ -258,7 +258,7 @@
                 { #c8ff724b: "cpplike", #2cdb06fb: [ "cpplike", "cpplike" ] },
                 { #c1127ea9: 31 },
                 {
-                  #d2e9b40c: "1107470972604094108",
+                  #d2e9b40c: "1603213277834459133",
                   #f1a45f0e: true,
                   #ebe3c415: 30,
                   #c11b7aa2:
@@ -372,7 +372,7 @@
                 { #c8ff724b: "cpplike", #2cdb06fb: [ "cpplike", "cpplike" ] },
                 { #c1127ea9: 37 },
                 {
-                  #d2e9b40c: "4402068687990998056",
+                  #d2e9b40c: "5877806831249345467",
                   #f1a45f0e: true,
                   #d17ebeaa: [
                     <#fd75cc45:
@@ -545,7 +545,7 @@
                 { #c8ff724b: "cpplike", #2cdb06fb: [ "cpplike", "cpplike" ] },
                 { #c1127ea9: 47 },
                 {
-                  #d2e9b40c: "17856063292060911243",
+                  #d2e9b40c: "17833126256375871848",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -571,7 +571,7 @@
                 { #c8ff724b: "cpplike", #2cdb06fb: [ "cpplike", "cpplike" ] },
                 { #c1127ea9: 51 },
                 {
-                  #d2e9b40c: "6680359559125245897",
+                  #d2e9b40c: "16041718976592305524",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -601,7 +601,7 @@
                 },
                 { #c1127ea9: 13 },
                 {
-                  #d2e9b40c: "10313252178728731272",
+                  #d2e9b40c: "11561666268372582658",
                   #f1a45f0e: true,
                   #3e64314e: true
                 },
@@ -1619,17 +1619,19 @@
             #d3368c8a: true,
             #1771a8d7: [
               <#efb2dc43:
-                 ({ #d121c0bd: 120, #21793419: ({ }, { }) }, <#caf525d3>)>
+                 ({ #d121c0bd: 120, #21793419: ({ }, { }) }, <#caf525d3>)>,
+              <#d98308a2: ({ #d121c0bd: 121, #21793419: ({ }, { }) })>,
+              <#f8178c07: ({ #d121c0bd: 122, #21793419: ({ }, { }) })>
             ]
           },
           { #c8ff724b: "operator new", #2cdb06fb: [ "operator new" ] },
-          { #c1127ea9: 121 },
+          { #c1127ea9: 123 },
           {
             #d2e9b40c: "5103882463850428890",
             #f1a45f0e: true,
             #d17ebeaa: [
               <#fd75cc45:
-                 ({ #d121c0bd: 122, #21793419: ({ }, { }), #eb8a1f5a: true },
+                 ({ #d121c0bd: 124, #21793419: ({ }, { }), #eb8a1f5a: true },
                   { #c8ff724b: "", #2cdb06fb: [ "" ] },
                   { #c1127ea9: 67 },
                   { #0370b1b2: 0 })>
@@ -1637,24 +1639,26 @@
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 123,
+            #d121c0bd: 125,
             #21793419: ({ }, { }),
             #eb8a1f5a: true,
             #0a16e1f2: true,
             #d3368c8a: true,
             #1771a8d7: [
               <#efb2dc43:
-                 ({ #d121c0bd: 124, #21793419: ({ }, { }) }, <#caf525d3>)>
+                 ({ #d121c0bd: 126, #21793419: ({ }, { }) }, <#caf525d3>)>,
+              <#d98308a2: ({ #d121c0bd: 127, #21793419: ({ }, { }) })>,
+              <#f8178c07: ({ #d121c0bd: 128, #21793419: ({ }, { }) })>
             ]
           },
           { #c8ff724b: "operator new[]", #2cdb06fb: [ "operator new[]" ] },
-          { #c1127ea9: 121 },
+          { #c1127ea9: 123 },
           {
             #d2e9b40c: "5124988689061404296",
             #f1a45f0e: true,
             #d17ebeaa: [
               <#fd75cc45:
-                 ({ #d121c0bd: 125, #21793419: ({ }, { }), #eb8a1f5a: true },
+                 ({ #d121c0bd: 129, #21793419: ({ }, { }), #eb8a1f5a: true },
                   { #c8ff724b: "", #2cdb06fb: [ "" ] },
                   { #c1127ea9: 67 },
                   { #0370b1b2: 0 })>
@@ -1662,60 +1666,60 @@
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 126,
+            #d121c0bd: 130,
             #21793419: ({ }, { }),
             #eb8a1f5a: true,
             #0a16e1f2: true,
             #d3368c8a: true,
             #1771a8d7: [
               <#efb2dc43:
-                 ({ #d121c0bd: 127, #21793419: ({ }, { }) }, <#caf525d3>)>
+                 ({ #d121c0bd: 131, #21793419: ({ }, { }) }, <#caf525d3>)>
             ]
           },
           { #c8ff724b: "operator delete", #2cdb06fb: [ "operator delete" ] },
-          { #c1127ea9: 128 },
+          { #c1127ea9: 132 },
           {
             #d2e9b40c: "9332647001762808742",
             #f1a45f0e: true,
             #d17ebeaa: [
               <#fd75cc45:
-                 ({ #d121c0bd: 129, #21793419: ({ }, { }), #eb8a1f5a: true },
+                 ({ #d121c0bd: 133, #21793419: ({ }, { }), #eb8a1f5a: true },
                   { #c8ff724b: "", #2cdb06fb: [ "" ] },
-                  { #c1127ea9: 130 },
+                  { #c1127ea9: 134 },
                   { #0370b1b2: 0 })>
             ]
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 131,
+            #d121c0bd: 135,
             #21793419: ({ }, { }),
             #eb8a1f5a: true,
             #0a16e1f2: true,
             #d3368c8a: true,
             #1771a8d7: [
               <#efb2dc43:
-                 ({ #d121c0bd: 132, #21793419: ({ }, { }) }, <#caf525d3>)>
+                 ({ #d121c0bd: 136, #21793419: ({ }, { }) }, <#caf525d3>)>
             ]
           },
           {
             #c8ff724b: "operator delete[]",
             #2cdb06fb: [ "operator delete[]" ]
           },
-          { #c1127ea9: 128 },
+          { #c1127ea9: 132 },
           {
             #d2e9b40c: "12453587667872411061",
             #f1a45f0e: true,
             #d17ebeaa: [
               <#fd75cc45:
-                 ({ #d121c0bd: 133, #21793419: ({ }, { }), #eb8a1f5a: true },
+                 ({ #d121c0bd: 137, #21793419: ({ }, { }), #eb8a1f5a: true },
                   { #c8ff724b: "", #2cdb06fb: [ "" ] },
-                  { #c1127ea9: 130 },
+                  { #c1127ea9: 134 },
                   { #0370b1b2: 0 })>
             ]
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 134,
+            #d121c0bd: 138,
             #21793419:
               ({ #c7b317f4: 38, #c68b4ed6: 1 },
                { #c7b317f4: 43, #c68b4ed6: 1 })
@@ -1725,11 +1729,11 @@
           {
             #d2e9b40c: "6095890702841955930",
             #f1a45f0e: true,
-            #ebe3c415: 134,
+            #ebe3c415: 138,
             #c11b7aa2:
               <#d394bb73:
                  ({
-                    #d121c0bd: 135,
+                    #d121c0bd: 139,
                     #21793419:
                       ({ #c7b317f4: 38, #c68b4ed6: 17 },
                        { #c7b317f4: 43, #c68b4ed6: 1 })
@@ -1737,7 +1741,7 @@
                   [
                     <#152ea3f2:
                        ({
-                          #d121c0bd: 136,
+                          #d121c0bd: 140,
                           #21793419:
                             ({ #c7b317f4: 39, #c68b4ed6: 3 },
                              { #c68b4ed6: 32 })
@@ -1745,21 +1749,21 @@
                         [
                           <#c00c83f2:
                              ({
-                                #d121c0bd: 137,
+                                #d121c0bd: 141,
                                 #21793419:
                                   ({ #c68b4ed6: 13 }, { #c68b4ed6: 31 })
                               },
                               [
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 138,
+                                      #d121c0bd: 142,
                                       #21793419:
                                         ({ #c68b4ed6: 21 }, { #c68b4ed6: 21 })
                                     },
                                     [
                                       <#0fb8fb71:
                                          ({
-                                            #d121c0bd: 139,
+                                            #d121c0bd: 143,
                                             #21793419:
                                               ({ #c68b4ed6: 21 },
                                                { #c68b4ed6: 21 })
@@ -1776,14 +1780,14 @@
                                     { #c91e0a14: <#2677d46b>, #fa1a3bd3: [] })>,
                                 <#0fdba003:
                                    ({
-                                      #d121c0bd: 140,
+                                      #d121c0bd: 144,
                                       #21793419:
                                         ({ #c68b4ed6: 23 }, { #c68b4ed6: 31 })
                                     },
                                     [
                                       <#0fb8fb71:
                                          ({
-                                            #d121c0bd: 141,
+                                            #d121c0bd: 145,
                                             #21793419:
                                               ({ #c68b4ed6: 24 },
                                                { #c68b4ed6: 24 })
@@ -1797,7 +1801,7 @@
                                           })>,
                                       <#0fb8fb71:
                                          ({
-                                            #d121c0bd: 142,
+                                            #d121c0bd: 146,
                                             #21793419:
                                               ({ #c68b4ed6: 27 },
                                                { #c68b4ed6: 27 })
@@ -1811,7 +1815,7 @@
                                           })>,
                                       <#0fb8fb71:
                                          ({
-                                            #d121c0bd: 143,
+                                            #d121c0bd: 147,
                                             #21793419:
                                               ({ #c68b4ed6: 30 },
                                                { #c68b4ed6: 30 })
@@ -1824,19 +1828,19 @@
                                             #31b87f71: "3"
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 144 } })>
+                                    { #30e4876a: { #c1127ea9: 148 } })>
                               ],
                               { #30e4876a: { #c1127ea9: 60 } },
                               {
                                 #c54bdc44: true,
-                                #c4225f4d: 138,
-                                #d04948b2: 140
+                                #c4225f4d: 142,
+                                #d04948b2: 144
                               })>
                         ],
                         [
                           <#11c182d1:
                              ({
-                                #d121c0bd: 145,
+                                #d121c0bd: 149,
                                 #21793419:
                                   ({ #c68b4ed6: 3 }, { #c68b4ed6: 31 })
                               },
@@ -1846,7 +1850,7 @@
                                 #fe93c404:
                                   <#c00c83f2:
                                      ({
-                                        #d121c0bd: 137,
+                                        #d121c0bd: 141,
                                         #21793419:
                                           ({ #c68b4ed6: 13 },
                                            { #c68b4ed6: 31 })
@@ -1854,7 +1858,7 @@
                                       [
                                         <#c3b129f9:
                                            ({
-                                              #d121c0bd: 138,
+                                              #d121c0bd: 142,
                                               #21793419:
                                                 ({ #c68b4ed6: 21 },
                                                  { #c68b4ed6: 21 })
@@ -1862,7 +1866,7 @@
                                             [
                                               <#0fb8fb71:
                                                  ({
-                                                    #d121c0bd: 139,
+                                                    #d121c0bd: 143,
                                                     #21793419:
                                                       ({ #c68b4ed6: 21 },
                                                        { #c68b4ed6: 21 })
@@ -1886,7 +1890,7 @@
                                             })>,
                                         <#0fdba003:
                                            ({
-                                              #d121c0bd: 140,
+                                              #d121c0bd: 144,
                                               #21793419:
                                                 ({ #c68b4ed6: 23 },
                                                  { #c68b4ed6: 31 })
@@ -1894,7 +1898,7 @@
                                             [
                                               <#0fb8fb71:
                                                  ({
-                                                    #d121c0bd: 141,
+                                                    #d121c0bd: 145,
                                                     #21793419:
                                                       ({ #c68b4ed6: 24 },
                                                        { #c68b4ed6: 24 })
@@ -1912,7 +1916,7 @@
                                                   })>,
                                               <#0fb8fb71:
                                                  ({
-                                                    #d121c0bd: 142,
+                                                    #d121c0bd: 146,
                                                     #21793419:
                                                       ({ #c68b4ed6: 27 },
                                                        { #c68b4ed6: 27 })
@@ -1930,7 +1934,7 @@
                                                   })>,
                                               <#0fb8fb71:
                                                  ({
-                                                    #d121c0bd: 143,
+                                                    #d121c0bd: 147,
                                                     #21793419:
                                                       ({ #c68b4ed6: 30 },
                                                        { #c68b4ed6: 30 })
@@ -1947,19 +1951,19 @@
                                                     #31b87f71: "3"
                                                   })>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 144 } })>
+                                            { #30e4876a: { #c1127ea9: 148 } })>
                                       ],
                                       { #30e4876a: { #c1127ea9: 60 } },
                                       {
                                         #c54bdc44: true,
-                                        #c4225f4d: 138,
-                                        #d04948b2: 140
+                                        #c4225f4d: 142,
+                                        #d04948b2: 144
                                       })>
                               })>
                         ])>,
                     <#152ea3f2:
                        ({
-                          #d121c0bd: 146,
+                          #d121c0bd: 150,
                           #21793419:
                             ({ #c7b317f4: 40, #c68b4ed6: 3 },
                              { #c68b4ed6: 30 })
@@ -1967,21 +1971,21 @@
                         [
                           <#c00c83f2:
                              ({
-                                #d121c0bd: 147,
+                                #d121c0bd: 151,
                                 #21793419:
                                   ({ #c68b4ed6: 13 }, { #c68b4ed6: 29 })
                               },
                               [
                                 <#e5067ee9:
                                    ({
-                                      #d121c0bd: 148,
+                                      #d121c0bd: 152,
                                       #21793419:
                                         ({ #c68b4ed6: 17 }, { #c68b4ed6: 29 })
                                     },
                                     [
                                       <#0fb8fb71:
                                          ({
-                                            #d121c0bd: 149,
+                                            #d121c0bd: 153,
                                             #21793419:
                                               ({ #c68b4ed6: 25 },
                                                { #c68b4ed6: 25 })
@@ -1995,7 +1999,7 @@
                                           })>,
                                       <#0fb8fb71:
                                          ({
-                                            #d121c0bd: 150,
+                                            #d121c0bd: 154,
                                             #21793419:
                                               ({ #c68b4ed6: 28 },
                                                { #c68b4ed6: 28 })
@@ -2022,12 +2026,12 @@
                                     })>
                               ],
                               { #30e4876a: { #c1127ea9: 87 } },
-                              { #d04948b2: 148 })>
+                              { #d04948b2: 152 })>
                         ],
                         [
                           <#11c182d1:
                              ({
-                                #d121c0bd: 151,
+                                #d121c0bd: 155,
                                 #21793419:
                                   ({ #c68b4ed6: 3 }, { #c68b4ed6: 29 })
                               },
@@ -2037,7 +2041,7 @@
                                 #fe93c404:
                                   <#c00c83f2:
                                      ({
-                                        #d121c0bd: 147,
+                                        #d121c0bd: 151,
                                         #21793419:
                                           ({ #c68b4ed6: 13 },
                                            { #c68b4ed6: 29 })
@@ -2045,7 +2049,7 @@
                                       [
                                         <#e5067ee9:
                                            ({
-                                              #d121c0bd: 148,
+                                              #d121c0bd: 152,
                                               #21793419:
                                                 ({ #c68b4ed6: 17 },
                                                  { #c68b4ed6: 29 })
@@ -2053,7 +2057,7 @@
                                             [
                                               <#0fb8fb71:
                                                  ({
-                                                    #d121c0bd: 149,
+                                                    #d121c0bd: 153,
                                                     #21793419:
                                                       ({ #c68b4ed6: 25 },
                                                        { #c68b4ed6: 25 })
@@ -2071,7 +2075,7 @@
                                                   })>,
                                               <#0fb8fb71:
                                                  ({
-                                                    #d121c0bd: 150,
+                                                    #d121c0bd: 154,
                                                     #21793419:
                                                       ({ #c68b4ed6: 28 },
                                                        { #c68b4ed6: 28 })
@@ -2104,12 +2108,12 @@
                                             })>
                                       ],
                                       { #30e4876a: { #c1127ea9: 87 } },
-                                      { #d04948b2: 148 })>
+                                      { #d04948b2: 152 })>
                               })>
                         ])>,
                     <#152ea3f2:
                        ({
-                          #d121c0bd: 152,
+                          #d121c0bd: 156,
                           #21793419:
                             ({ #c7b317f4: 41, #c68b4ed6: 3 },
                              { #c68b4ed6: 53 })
@@ -2117,21 +2121,21 @@
                         [
                           <#c00c83f2:
                              ({
-                                #d121c0bd: 153,
+                                #d121c0bd: 157,
                                 #21793419:
                                   ({ #c68b4ed6: 15 }, { #c68b4ed6: 52 })
                               },
                               [
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 154,
+                                      #d121c0bd: 158,
                                       #21793419:
                                         ({ #c68b4ed6: 27 }, { #c68b4ed6: 27 })
                                     },
                                     [
                                       <#0fb8fb71:
                                          ({
-                                            #d121c0bd: 155,
+                                            #d121c0bd: 159,
                                             #21793419:
                                               ({ #c68b4ed6: 27 },
                                                { #c68b4ed6: 27 })
@@ -2148,14 +2152,14 @@
                                     { #c91e0a14: <#2677d46b>, #fa1a3bd3: [] })>,
                                 <#0fdba003:
                                    ({
-                                      #d121c0bd: 156,
+                                      #d121c0bd: 160,
                                       #21793419:
                                         ({ #c68b4ed6: 29 }, { #c68b4ed6: 52 })
                                     },
                                     [
                                       <#e5067ee9:
                                          ({
-                                            #d121c0bd: 157,
+                                            #d121c0bd: 161,
                                             #21793419:
                                               ({ #c68b4ed6: 30 },
                                                { #c68b4ed6: 35 })
@@ -2163,7 +2167,7 @@
                                           [
                                             <#0fb8fb71:
                                                ({
-                                                  #d121c0bd: 158,
+                                                  #d121c0bd: 162,
                                                   #21793419:
                                                     ({ #c68b4ed6: 31 },
                                                      { #c68b4ed6: 31 })
@@ -2181,7 +2185,7 @@
                                                 })>,
                                             <#0fb8fb71:
                                                ({
-                                                  #d121c0bd: 159,
+                                                  #d121c0bd: 163,
                                                   #21793419:
                                                     ({ #c68b4ed6: 34 },
                                                      { #c68b4ed6: 34 })
@@ -2214,7 +2218,7 @@
                                           })>,
                                       <#e5067ee9:
                                          ({
-                                            #d121c0bd: 160,
+                                            #d121c0bd: 164,
                                             #21793419:
                                               ({ #c68b4ed6: 38 },
                                                { #c68b4ed6: 43 })
@@ -2222,7 +2226,7 @@
                                           [
                                             <#0fb8fb71:
                                                ({
-                                                  #d121c0bd: 161,
+                                                  #d121c0bd: 165,
                                                   #21793419:
                                                     ({ #c68b4ed6: 39 },
                                                      { #c68b4ed6: 39 })
@@ -2240,7 +2244,7 @@
                                                 })>,
                                             <#0fb8fb71:
                                                ({
-                                                  #d121c0bd: 162,
+                                                  #d121c0bd: 166,
                                                   #21793419:
                                                     ({ #c68b4ed6: 42 },
                                                      { #c68b4ed6: 42 })
@@ -2273,7 +2277,7 @@
                                           })>,
                                       <#e5067ee9:
                                          ({
-                                            #d121c0bd: 163,
+                                            #d121c0bd: 167,
                                             #21793419:
                                               ({ #c68b4ed6: 46 },
                                                { #c68b4ed6: 51 })
@@ -2281,7 +2285,7 @@
                                           [
                                             <#0fb8fb71:
                                                ({
-                                                  #d121c0bd: 164,
+                                                  #d121c0bd: 168,
                                                   #21793419:
                                                     ({ #c68b4ed6: 47 },
                                                      { #c68b4ed6: 47 })
@@ -2299,7 +2303,7 @@
                                                 })>,
                                             <#0fb8fb71:
                                                ({
-                                                  #d121c0bd: 165,
+                                                  #d121c0bd: 169,
                                                   #21793419:
                                                     ({ #c68b4ed6: 50 },
                                                      { #c68b4ed6: 50 })
@@ -2331,19 +2335,19 @@
                                             }
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 166 } })>
+                                    { #30e4876a: { #c1127ea9: 170 } })>
                               ],
                               { #30e4876a: { #c1127ea9: 87 } },
                               {
                                 #c54bdc44: true,
-                                #c4225f4d: 154,
-                                #d04948b2: 156
+                                #c4225f4d: 158,
+                                #d04948b2: 160
                               })>
                         ],
                         [
                           <#11c182d1:
                              ({
-                                #d121c0bd: 167,
+                                #d121c0bd: 171,
                                 #21793419:
                                   ({ #c68b4ed6: 3 }, { #c68b4ed6: 52 })
                               },
@@ -2353,7 +2357,7 @@
                                 #fe93c404:
                                   <#c00c83f2:
                                      ({
-                                        #d121c0bd: 153,
+                                        #d121c0bd: 157,
                                         #21793419:
                                           ({ #c68b4ed6: 15 },
                                            { #c68b4ed6: 52 })
@@ -2361,7 +2365,7 @@
                                       [
                                         <#c3b129f9:
                                            ({
-                                              #d121c0bd: 154,
+                                              #d121c0bd: 158,
                                               #21793419:
                                                 ({ #c68b4ed6: 27 },
                                                  { #c68b4ed6: 27 })
@@ -2369,7 +2373,7 @@
                                             [
                                               <#0fb8fb71:
                                                  ({
-                                                    #d121c0bd: 155,
+                                                    #d121c0bd: 159,
                                                     #21793419:
                                                       ({ #c68b4ed6: 27 },
                                                        { #c68b4ed6: 27 })
@@ -2393,7 +2397,7 @@
                                             })>,
                                         <#0fdba003:
                                            ({
-                                              #d121c0bd: 156,
+                                              #d121c0bd: 160,
                                               #21793419:
                                                 ({ #c68b4ed6: 29 },
                                                  { #c68b4ed6: 52 })
@@ -2401,7 +2405,7 @@
                                             [
                                               <#e5067ee9:
                                                  ({
-                                                    #d121c0bd: 157,
+                                                    #d121c0bd: 161,
                                                     #21793419:
                                                       ({ #c68b4ed6: 30 },
                                                        { #c68b4ed6: 35 })
@@ -2409,7 +2413,7 @@
                                                   [
                                                     <#0fb8fb71:
                                                        ({
-                                                          #d121c0bd: 158,
+                                                          #d121c0bd: 162,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 31
@@ -2431,7 +2435,7 @@
                                                         })>,
                                                     <#0fb8fb71:
                                                        ({
-                                                          #d121c0bd: 159,
+                                                          #d121c0bd: 163,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 34
@@ -2475,7 +2479,7 @@
                                                   })>,
                                               <#e5067ee9:
                                                  ({
-                                                    #d121c0bd: 160,
+                                                    #d121c0bd: 164,
                                                     #21793419:
                                                       ({ #c68b4ed6: 38 },
                                                        { #c68b4ed6: 43 })
@@ -2483,7 +2487,7 @@
                                                   [
                                                     <#0fb8fb71:
                                                        ({
-                                                          #d121c0bd: 161,
+                                                          #d121c0bd: 165,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 39
@@ -2505,7 +2509,7 @@
                                                         })>,
                                                     <#0fb8fb71:
                                                        ({
-                                                          #d121c0bd: 162,
+                                                          #d121c0bd: 166,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 42
@@ -2549,7 +2553,7 @@
                                                   })>,
                                               <#e5067ee9:
                                                  ({
-                                                    #d121c0bd: 163,
+                                                    #d121c0bd: 167,
                                                     #21793419:
                                                       ({ #c68b4ed6: 46 },
                                                        { #c68b4ed6: 51 })
@@ -2557,7 +2561,7 @@
                                                   [
                                                     <#0fb8fb71:
                                                        ({
-                                                          #d121c0bd: 164,
+                                                          #d121c0bd: 168,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 47
@@ -2579,7 +2583,7 @@
                                                         })>,
                                                     <#0fb8fb71:
                                                        ({
-                                                          #d121c0bd: 165,
+                                                          #d121c0bd: 169,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 50
@@ -2622,13 +2626,13 @@
                                                     }
                                                   })>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 166 } })>
+                                            { #30e4876a: { #c1127ea9: 170 } })>
                                       ],
                                       { #30e4876a: { #c1127ea9: 87 } },
                                       {
                                         #c54bdc44: true,
-                                        #c4225f4d: 154,
-                                        #d04948b2: 156
+                                        #c4225f4d: 158,
+                                        #d04948b2: 160
                                       })>
                               })>
                         ])>
@@ -2636,7 +2640,7 @@
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 168,
+            #d121c0bd: 172,
             #21793419:
               ({ #c7b317f4: 45, #c68b4ed6: 1 },
                { #c7b317f4: 47, #c68b4ed6: 1 }),
@@ -2644,14 +2648,14 @@
             #d3368c8a: true
           },
           { #c8ff724b: "operator new", #2cdb06fb: [ "operator new" ] },
-          { #c1127ea9: 169 },
+          { #c1127ea9: 173 },
           {
             #d2e9b40c: "13351464032276683690",
             #f1a45f0e: true,
             #d17ebeaa: [
               <#fd75cc45:
                  ({
-                    #d121c0bd: 170,
+                    #d121c0bd: 174,
                     #21793419:
                       ({ #c7b317f4: 45, #c68b4ed6: 20 }, { #c68b4ed6: 34 })
                   },
@@ -2660,35 +2664,35 @@
                   { #0370b1b2: 0 })>,
               <#fd75cc45:
                  ({
-                    #d121c0bd: 171,
+                    #d121c0bd: 175,
                     #21793419: ({ #c68b4ed6: 40 }, { #c68b4ed6: 46 })
                   },
                   { #c8ff724b: "ptr", #2cdb06fb: [ "ptr" ] },
-                  { #c1127ea9: 130 },
+                  { #c1127ea9: 134 },
                   { #0370b1b2: 1 })>,
               <#fd75cc45:
                  ({
-                    #d121c0bd: 172,
+                    #d121c0bd: 176,
                     #21793419: ({ #c68b4ed6: 51 }, { #c68b4ed6: 57 }),
                     #0a16e1f2: true,
                     #d3368c8a: true
                   },
                   { #c8ff724b: "ptr2", #2cdb06fb: [ "ptr2" ] },
-                  { #c1127ea9: 130 },
+                  { #c1127ea9: 134 },
                   { #0370b1b2: 2 })>
             ],
-            #ebe3c415: 168,
+            #ebe3c415: 172,
             #c11b7aa2:
               <#d394bb73:
                  ({
-                    #d121c0bd: 173,
+                    #d121c0bd: 177,
                     #21793419:
                       ({ #c68b4ed6: 72 }, { #c7b317f4: 47, #c68b4ed6: 1 })
                   },
                   [
                     <#df3bdb38:
                        ({
-                          #d121c0bd: 174,
+                          #d121c0bd: 178,
                           #21793419:
                             ({ #c7b317f4: 46, #c68b4ed6: 3 },
                              { #c68b4ed6: 10 })
@@ -2696,81 +2700,81 @@
                         [
                           <#c3b129f9:
                              ({
-                                #d121c0bd: 175,
+                                #d121c0bd: 179,
                                 #21793419:
                                   ({ #c68b4ed6: 10 }, { #c68b4ed6: 10 })
                               },
                               [
                                 <#e9db58be:
                                    ({
-                                      #d121c0bd: 176,
+                                      #d121c0bd: 180,
                                       #21793419:
                                         ({ #c68b4ed6: 10 }, { #c68b4ed6: 10 })
                                     },
                                     [],
                                     {
-                                      #30e4876a: { #c1127ea9: 130 },
+                                      #30e4876a: { #c1127ea9: 134 },
                                       #0e89e422: <#28055b85>
                                     },
                                     {
                                       #c369ebbe: {
                                         #c709e154: <#334f163b>,
-                                        #ec05e4a8: 172,
+                                        #ec05e4a8: 176,
                                         #c8ff724b: {
                                           #c8ff724b: "ptr2",
                                           #2cdb06fb: [ "ptr2" ]
                                         },
-                                        #30e4876a: { #c1127ea9: 130 }
+                                        #30e4876a: { #c1127ea9: 134 }
                                       }
                                     })>
                               ],
-                              { #30e4876a: { #c1127ea9: 130 } },
+                              { #30e4876a: { #c1127ea9: 134 } },
                               { #c91e0a14: <#f7495e1f>, #fa1a3bd3: [] })>
                         ])>
                   ])>
           })>,
       <#21116177:
          ({
-            #d121c0bd: 177,
+            #d121c0bd: 181,
             #21793419: ({ #c7b317f4: 47, #c68b4ed6: 2 }, { #c68b4ed6: 2 })
           })>,
       <#f173dfc2:
          ({
-            #d121c0bd: 178,
+            #d121c0bd: 182,
             #21793419:
               ({ #c7b317f4: 49, #c68b4ed6: 1 },
                { #c7b317f4: 52, #c68b4ed6: 1 })
           },
           { #c8ff724b: "test_placement", #2cdb06fb: [ "test_placement" ] },
-          { #c1127ea9: 179 },
+          { #c1127ea9: 183 },
           {
             #d2e9b40c: "1553186570458038035",
             #f1a45f0e: true,
             #d17ebeaa: [
               <#fd75cc45:
                  ({
-                    #d121c0bd: 180,
+                    #d121c0bd: 184,
                     #21793419:
                       ({ #c7b317f4: 49, #c68b4ed6: 21 }, { #c68b4ed6: 27 }),
                     #0a16e1f2: true,
                     #d3368c8a: true
                   },
                   { #c8ff724b: "ptr", #2cdb06fb: [ "ptr" ] },
-                  { #c1127ea9: 130 },
+                  { #c1127ea9: 134 },
                   { #0370b1b2: 0 })>
             ],
-            #ebe3c415: 178,
+            #ebe3c415: 182,
             #c11b7aa2:
               <#d394bb73:
                  ({
-                    #d121c0bd: 181,
+                    #d121c0bd: 185,
                     #21793419:
                       ({ #c68b4ed6: 32 }, { #c7b317f4: 52, #c68b4ed6: 1 })
                   },
                   [
                     <#152ea3f2:
                        ({
-                          #d121c0bd: 182,
+                          #d121c0bd: 186,
                           #21793419:
                             ({ #c7b317f4: 50, #c68b4ed6: 3 },
                              { #c68b4ed6: 12 })
@@ -2778,7 +2782,7 @@
                         [
                           <#0fb8fb71:
                              ({
-                                #d121c0bd: 183,
+                                #d121c0bd: 187,
                                 #21793419:
                                   ({ #c68b4ed6: 11 }, { #c68b4ed6: 11 })
                               },
@@ -2793,7 +2797,7 @@
                         [
                           <#11c182d1:
                              ({
-                                #d121c0bd: 184,
+                                #d121c0bd: 188,
                                 #21793419:
                                   ({ #c68b4ed6: 3 }, { #c68b4ed6: 11 }),
                                 #0a16e1f2: true,
@@ -2805,7 +2809,7 @@
                                 #fe93c404:
                                   <#0fb8fb71:
                                      ({
-                                        #d121c0bd: 183,
+                                        #d121c0bd: 187,
                                         #21793419:
                                           ({ #c68b4ed6: 11 },
                                            { #c68b4ed6: 11 })
@@ -2821,7 +2825,7 @@
                         ])>,
                     <#152ea3f2:
                        ({
-                          #d121c0bd: 185,
+                          #d121c0bd: 189,
                           #21793419:
                             ({ #c7b317f4: 51, #c68b4ed6: 3 },
                              { #c68b4ed6: 30 })
@@ -2829,14 +2833,14 @@
                         [
                           <#c00c83f2:
                              ({
-                                #d121c0bd: 186,
+                                #d121c0bd: 190,
                                 #21793419:
                                   ({ #c68b4ed6: 13 }, { #c68b4ed6: 27 })
                               },
                               [
                                 <#e5067ee9:
                                    ({
-                                      #d121c0bd: 187,
+                                      #d121c0bd: 191,
                                       #21793419:
                                         ({ #c68b4ed6: 27 }, { #c68b4ed6: 27 })
                                     },
@@ -2855,47 +2859,47 @@
                                     })>,
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 188,
+                                      #d121c0bd: 192,
                                       #21793419:
                                         ({ #c68b4ed6: 18 }, { #c68b4ed6: 18 })
                                     },
                                     [
                                       <#e9db58be:
                                          ({
-                                            #d121c0bd: 189,
+                                            #d121c0bd: 193,
                                             #21793419:
                                               ({ #c68b4ed6: 18 },
                                                { #c68b4ed6: 18 })
                                           },
                                           [],
                                           {
-                                            #30e4876a: { #c1127ea9: 130 },
+                                            #30e4876a: { #c1127ea9: 134 },
                                             #0e89e422: <#28055b85>
                                           },
                                           {
                                             #c369ebbe: {
                                               #c709e154: <#334f163b>,
-                                              #ec05e4a8: 180,
+                                              #ec05e4a8: 184,
                                               #c8ff724b: {
                                                 #c8ff724b: "ptr",
                                                 #2cdb06fb: [ "ptr" ]
                                               },
-                                              #30e4876a: { #c1127ea9: 130 }
+                                              #30e4876a: { #c1127ea9: 134 }
                                             }
                                           })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 130 } },
+                                    { #30e4876a: { #c1127ea9: 134 } },
                                     { #c91e0a14: <#f7495e1f>, #fa1a3bd3: [] })>,
                                 <#c3b129f9:
                                    ({
-                                      #d121c0bd: 190,
+                                      #d121c0bd: 194,
                                       #21793419:
                                         ({ #c68b4ed6: 23 }, { #c68b4ed6: 24 })
                                     },
                                     [
                                       <#30da4453:
                                          ({
-                                            #d121c0bd: 191,
+                                            #d121c0bd: 195,
                                             #21793419:
                                               ({ #c68b4ed6: 23 },
                                                { #c68b4ed6: 24 })
@@ -2903,7 +2907,7 @@
                                           [
                                             <#e9db58be:
                                                ({
-                                                  #d121c0bd: 192,
+                                                  #d121c0bd: 196,
                                                   #21793419:
                                                     ({ #c68b4ed6: 24 },
                                                      { #c68b4ed6: 24 })
@@ -2918,7 +2922,7 @@
                                                 {
                                                   #c369ebbe: {
                                                     #c709e154: <#004196c7>,
-                                                    #ec05e4a8: 184,
+                                                    #ec05e4a8: 188,
                                                     #c8ff724b: {
                                                       #c8ff724b: "i",
                                                       #2cdb06fb: [ "i" ]
@@ -2932,16 +2936,16 @@
                                           { #30e4876a: { #c1127ea9: 60 } },
                                           { #c709e154: <#d3b492c8> })>
                                     ],
-                                    { #30e4876a: { #c1127ea9: 130 } },
+                                    { #30e4876a: { #c1127ea9: 134 } },
                                     { #c91e0a14: <#2b10160c>, #fa1a3bd3: [] })>
                               ],
                               { #30e4876a: { #c1127ea9: 72 } },
-                              { #d04948b2: 187, #cacc0137: [ 188, 190 ] })>
+                              { #d04948b2: 191, #cacc0137: [ 192, 194 ] })>
                         ],
                         [
                           <#11c182d1:
                              ({
-                                #d121c0bd: 193,
+                                #d121c0bd: 197,
                                 #21793419:
                                   ({ #c68b4ed6: 3 }, { #c68b4ed6: 27 })
                               },
@@ -2951,7 +2955,7 @@
                                 #fe93c404:
                                   <#c00c83f2:
                                      ({
-                                        #d121c0bd: 186,
+                                        #d121c0bd: 190,
                                         #21793419:
                                           ({ #c68b4ed6: 13 },
                                            { #c68b4ed6: 27 })
@@ -2959,7 +2963,7 @@
                                       [
                                         <#e5067ee9:
                                            ({
-                                              #d121c0bd: 187,
+                                              #d121c0bd: 191,
                                               #21793419:
                                                 ({ #c68b4ed6: 27 },
                                                  { #c68b4ed6: 27 })
@@ -2979,7 +2983,7 @@
                                             })>,
                                         <#c3b129f9:
                                            ({
-                                              #d121c0bd: 188,
+                                              #d121c0bd: 192,
                                               #21793419:
                                                 ({ #c68b4ed6: 18 },
                                                  { #c68b4ed6: 18 })
@@ -2987,7 +2991,7 @@
                                             [
                                               <#e9db58be:
                                                  ({
-                                                    #d121c0bd: 189,
+                                                    #d121c0bd: 193,
                                                     #21793419:
                                                       ({ #c68b4ed6: 18 },
                                                        { #c68b4ed6: 18 })
@@ -2995,32 +2999,32 @@
                                                   [],
                                                   {
                                                     #30e4876a: {
-                                                      #c1127ea9: 130
+                                                      #c1127ea9: 134
                                                     },
                                                     #0e89e422: <#28055b85>
                                                   },
                                                   {
                                                     #c369ebbe: {
                                                       #c709e154: <#334f163b>,
-                                                      #ec05e4a8: 180,
+                                                      #ec05e4a8: 184,
                                                       #c8ff724b: {
                                                         #c8ff724b: "ptr",
                                                         #2cdb06fb: [ "ptr" ]
                                                       },
                                                       #30e4876a: {
-                                                        #c1127ea9: 130
+                                                        #c1127ea9: 134
                                                       }
                                                     }
                                                   })>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 130 } },
+                                            { #30e4876a: { #c1127ea9: 134 } },
                                             {
                                               #c91e0a14: <#f7495e1f>,
                                               #fa1a3bd3: []
                                             })>,
                                         <#c3b129f9:
                                            ({
-                                              #d121c0bd: 190,
+                                              #d121c0bd: 194,
                                               #21793419:
                                                 ({ #c68b4ed6: 23 },
                                                  { #c68b4ed6: 24 })
@@ -3028,7 +3032,7 @@
                                             [
                                               <#30da4453:
                                                  ({
-                                                    #d121c0bd: 191,
+                                                    #d121c0bd: 195,
                                                     #21793419:
                                                       ({ #c68b4ed6: 23 },
                                                        { #c68b4ed6: 24 })
@@ -3036,7 +3040,7 @@
                                                   [
                                                     <#e9db58be:
                                                        ({
-                                                          #d121c0bd: 192,
+                                                          #d121c0bd: 196,
                                                           #21793419:
                                                             ({
                                                                #c68b4ed6: 24
@@ -3057,7 +3061,7 @@
                                                           #c369ebbe: {
                                                             #c709e154:
                                                               <#004196c7>,
-                                                            #ec05e4a8: 184,
+                                                            #ec05e4a8: 188,
                                                             #c8ff724b: {
                                                               #c8ff724b: "i",
                                                               #2cdb06fb: [
@@ -3077,7 +3081,7 @@
                                                   },
                                                   { #c709e154: <#d3b492c8> })>
                                             ],
-                                            { #30e4876a: { #c1127ea9: 130 } },
+                                            { #30e4876a: { #c1127ea9: 134 } },
                                             {
                                               #c91e0a14: <#2b10160c>,
                                               #fa1a3bd3: []
@@ -3085,17 +3089,17 @@
                                       ],
                                       { #30e4876a: { #c1127ea9: 72 } },
                                       {
-                                        #d04948b2: 187,
-                                        #cacc0137: [ 188, 190 ]
+                                        #d04948b2: 191,
+                                        #cacc0137: [ 192, 194 ]
                                       })>
                               })>
                         ])>
                   ])>
           })>,
       <#0f3f4d35:
-         ({ #d121c0bd: 194, #21793419: ({ }, { }), #eb8a1f5a: true },
+         ({ #d121c0bd: 198, #21793419: ({ }, { }), #eb8a1f5a: true },
           { #c8ff724b: "instancetype", #2cdb06fb: [ "instancetype" ] },
-          195,
+          199,
           { })>
     ],
     { },
@@ -3111,78 +3115,79 @@
       },
       #1acb7079: [
         <#22d546dd: ({ #d121c0bd: 100 }, <#392cef74>)>,
-        <#22d546dd: ({ #d121c0bd: 196 }, <#2bf4b04a>)>,
-        <#22d546dd: ({ #d121c0bd: 197 }, <#ec0a078a>)>,
-        <#22d546dd: ({ #d121c0bd: 198 }, <#f6dab0c9>)>,
-        <#22d546dd: ({ #d121c0bd: 199 }, <#0f54f45c>)>,
+        <#22d546dd: ({ #d121c0bd: 200 }, <#2bf4b04a>)>,
+        <#22d546dd: ({ #d121c0bd: 201 }, <#ec0a078a>)>,
+        <#22d546dd: ({ #d121c0bd: 202 }, <#f6dab0c9>)>,
+        <#22d546dd: ({ #d121c0bd: 203 }, <#0f54f45c>)>,
         <#22d546dd: ({ #d121c0bd: 11 }, <#0037c4cf>)>,
-        <#22d546dd: ({ #d121c0bd: 200 }, <#3290d19c>)>,
-        <#22d546dd: ({ #d121c0bd: 201 }, <#fee0a138>)>,
-        <#22d546dd: ({ #d121c0bd: 202 }, <#1da7d9cb>)>,
-        <#22d546dd: ({ #d121c0bd: 203 }, <#0baa9fe7>)>,
-        <#22d546dd: ({ #d121c0bd: 204 }, <#3866e79a>)>,
+        <#22d546dd: ({ #d121c0bd: 204 }, <#3290d19c>)>,
+        <#22d546dd: ({ #d121c0bd: 205 }, <#fee0a138>)>,
+        <#22d546dd: ({ #d121c0bd: 206 }, <#1da7d9cb>)>,
+        <#22d546dd: ({ #d121c0bd: 207 }, <#0baa9fe7>)>,
+        <#22d546dd: ({ #d121c0bd: 208 }, <#3866e79a>)>,
         <#22d546dd: ({ #d121c0bd: 67 }, <#23a02071>)>,
-        <#22d546dd: ({ #d121c0bd: 205 }, <#09087e8d>)>,
-        <#22d546dd: ({ #d121c0bd: 206 }, <#15c4357c>)>,
-        <#22d546dd: ({ #d121c0bd: 207 }, <#e75f9f31>)>,
-        <#22d546dd: ({ #d121c0bd: 208 }, <#c2f78dcd>)>,
-        <#22d546dd: ({ #d121c0bd: 209 }, <#3726ba3b>)>,
-        <#22d546dd: ({ #d121c0bd: 210 }, <#3759b761>)>,
-        <#22d546dd: ({ #d121c0bd: 211 }, <#ebd317dd>)>,
-        <#22d546dd: ({ #d121c0bd: 212 }, <#2ec759b9>)>,
-        <#22d546dd: ({ #d121c0bd: 213 }, <#284d329d>)>,
-        <#22d546dd: ({ #d121c0bd: 214 }, <#35acb472>)>,
-        <#22d546dd: ({ #d121c0bd: 215 }, <#2b1d0544>)>,
-        <#22d546dd: ({ #d121c0bd: 216 }, <#0106ffa8>)>,
-        <#22d546dd: ({ #d121c0bd: 217 }, <#d6bc9d8a>)>,
-        <#22d546dd: ({ #d121c0bd: 218 }, <#19b0df66>)>,
-        <#22d546dd: ({ #d121c0bd: 219 }, <#1336b84a>)>,
-        <#22d546dd: ({ #d121c0bd: 220 }, <#20963a1f>)>,
-        <#22d546dd: ({ #d121c0bd: 221 }, <#16068af1>)>,
-        <#22d546dd: ({ #d121c0bd: 222 }, <#ebf08555>)>,
-        <#22d546dd: ({ #d121c0bd: 223 }, <#d78ceb63>)>,
-        <#22d546dd: ({ #d121c0bd: 224 }, <#dd2a33f3>)>,
-        <#22d546dd: ({ #d121c0bd: 225 }, <#ef62b1d7>)>,
-        <#22d546dd: ({ #d121c0bd: 226 }, <#0c8bf62c>)>,
-        <#22d546dd: ({ #d121c0bd: 227 }, <#13391dca>)>,
-        <#22d546dd: ({ #d121c0bd: 228 }, <#ecc0d32e>)>,
-        <#22d546dd: ({ #d121c0bd: 229 }, <#c2767110>)>,
-        <#22d546dd: ({ #d121c0bd: 230 }, <#c813b9a0>)>,
-        <#22d546dd: ({ #d121c0bd: 231 }, <#da4c3784>)>,
-        <#22d546dd: ({ #d121c0bd: 232 }, <#f7757bd9>)>,
-        <#22d546dd: ({ #d121c0bd: 233 }, <#fe22a377>)>,
-        <#22d546dd: ({ #d121c0bd: 234 }, <#d7aa58db>)>,
-        <#22d546dd: ({ #d121c0bd: 235 }, <#d2f340c8>)>,
-        <#22d546dd: ({ #d121c0bd: 236 }, <#2193aedd>)>,
-        <#22d546dd: ({ #d121c0bd: 237 }, <#0dd56321>)>,
-        <#22d546dd: ({ #d121c0bd: 238 }, <#d8e10c82>)>,
-        <#22d546dd: ({ #d121c0bd: 239 }, <#ec09df5b>)>,
-        <#22d546dd: ({ #d121c0bd: 240 }, <#ec09e115>)>,
-        <#22d546dd: ({ #d121c0bd: 241 }, <#c4f079df>)>,
-        <#22d546dd: ({ #d121c0bd: 242 }, <#1ee7219a>)>,
-        <#22d546dd: ({ #d121c0bd: 243 }, <#0d506118>)>,
-        <#22d546dd: ({ #d121c0bd: 244 }, <#dec9bcfd>)>,
-        <#22d546dd: ({ #d121c0bd: 245 }, <#f1f6e5a2>)>,
-        <#22d546dd: ({ #d121c0bd: 246 }, <#d935d0cf>)>,
-        <#22d546dd: ({ #d121c0bd: 247 }, <#d35a4eab>)>,
-        <#2e6cf4ea: ({ #d121c0bd: 248 })>,
-        <#2e6cf4ea: ({ #d121c0bd: 249 })>,
-        <#2e6cf4ea: ({ #d121c0bd: 250 })>,
-        <#2e6cf4ea: ({ #d121c0bd: 251 })>,
-        <#22d546dd: ({ #d121c0bd: 252 }, <#c9ba0f87>)>,
-        <#22d546dd: ({ #d121c0bd: 253 }, <#db21580c>)>,
-        <#22d546dd: ({ #d121c0bd: 254 }, <#391b1e6e>)>,
-        <#d3d219f7: ({ #d121c0bd: 130 }, { #c1127ea9: 100 })>,
-        <#22d546dd: ({ #d121c0bd: 255 }, <#ea323187>)>,
-        <#22d546dd: ({ #d121c0bd: 256 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 257 }, 258)>,
-        <#d3d219f7: ({ #d121c0bd: 259 }, { #c1127ea9: 11, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 260 }, { #c1127ea9: 197, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 261 }, { #c1127ea9: 197 })>,
+        <#22d546dd: ({ #d121c0bd: 209 }, <#09087e8d>)>,
+        <#22d546dd: ({ #d121c0bd: 210 }, <#15c4357c>)>,
+        <#22d546dd: ({ #d121c0bd: 211 }, <#e75f9f31>)>,
+        <#22d546dd: ({ #d121c0bd: 212 }, <#c2f78dcd>)>,
+        <#22d546dd: ({ #d121c0bd: 213 }, <#3726ba3b>)>,
+        <#22d546dd: ({ #d121c0bd: 214 }, <#3759b761>)>,
+        <#22d546dd: ({ #d121c0bd: 215 }, <#ebd317dd>)>,
+        <#22d546dd: ({ #d121c0bd: 216 }, <#2ec759b9>)>,
+        <#22d546dd: ({ #d121c0bd: 217 }, <#284d329d>)>,
+        <#22d546dd: ({ #d121c0bd: 218 }, <#35acb472>)>,
+        <#22d546dd: ({ #d121c0bd: 219 }, <#2b1d0544>)>,
+        <#22d546dd: ({ #d121c0bd: 220 }, <#0106ffa8>)>,
+        <#22d546dd: ({ #d121c0bd: 221 }, <#d6bc9d8a>)>,
+        <#22d546dd: ({ #d121c0bd: 222 }, <#19b0df66>)>,
+        <#22d546dd: ({ #d121c0bd: 223 }, <#1336b84a>)>,
+        <#22d546dd: ({ #d121c0bd: 224 }, <#20963a1f>)>,
+        <#22d546dd: ({ #d121c0bd: 225 }, <#16068af1>)>,
+        <#22d546dd: ({ #d121c0bd: 226 }, <#ebf08555>)>,
+        <#22d546dd: ({ #d121c0bd: 227 }, <#d78ceb63>)>,
+        <#22d546dd: ({ #d121c0bd: 228 }, <#dd2a33f3>)>,
+        <#22d546dd: ({ #d121c0bd: 229 }, <#ef62b1d7>)>,
+        <#22d546dd: ({ #d121c0bd: 230 }, <#0c8bf62c>)>,
+        <#22d546dd: ({ #d121c0bd: 231 }, <#13391dca>)>,
+        <#22d546dd: ({ #d121c0bd: 232 }, <#ecc0d32e>)>,
+        <#22d546dd: ({ #d121c0bd: 233 }, <#c2767110>)>,
+        <#22d546dd: ({ #d121c0bd: 234 }, <#c813b9a0>)>,
+        <#22d546dd: ({ #d121c0bd: 235 }, <#da4c3784>)>,
+        <#22d546dd: ({ #d121c0bd: 236 }, <#f7757bd9>)>,
+        <#22d546dd: ({ #d121c0bd: 237 }, <#fe22a377>)>,
+        <#22d546dd: ({ #d121c0bd: 238 }, <#d7aa58db>)>,
+        <#22d546dd: ({ #d121c0bd: 239 }, <#d2f340c8>)>,
+        <#22d546dd: ({ #d121c0bd: 240 }, <#2193aedd>)>,
+        <#22d546dd: ({ #d121c0bd: 241 }, <#0dd56321>)>,
+        <#22d546dd: ({ #d121c0bd: 242 }, <#d8e10c82>)>,
+        <#22d546dd: ({ #d121c0bd: 243 }, <#ec09df5b>)>,
+        <#22d546dd: ({ #d121c0bd: 244 }, <#ec09e115>)>,
+        <#22d546dd: ({ #d121c0bd: 245 }, <#c4f079df>)>,
+        <#22d546dd: ({ #d121c0bd: 246 }, <#1ee7219a>)>,
+        <#22d546dd: ({ #d121c0bd: 247 }, <#0d506118>)>,
+        <#22d546dd: ({ #d121c0bd: 248 }, <#dec9bcfd>)>,
+        <#22d546dd: ({ #d121c0bd: 249 }, <#f1f6e5a2>)>,
+        <#22d546dd: ({ #d121c0bd: 250 }, <#d935d0cf>)>,
+        <#22d546dd: ({ #d121c0bd: 251 }, <#d35a4eab>)>,
+        <#2e6cf4ea: ({ #d121c0bd: 252 })>,
+        <#2e6cf4ea: ({ #d121c0bd: 253 })>,
+        <#2e6cf4ea: ({ #d121c0bd: 254 })>,
+        <#2e6cf4ea: ({ #d121c0bd: 255 })>,
+        <#22d546dd: ({ #d121c0bd: 256 }, <#c9ba0f87>)>,
+        <#22d546dd: ({ #d121c0bd: 257 }, <#db21580c>)>,
+        <#22d546dd: ({ #d121c0bd: 258 }, <#391b1e6e>)>,
+        <#d3d219f7: ({ #d121c0bd: 134 }, { #c1127ea9: 100 })>,
+        <#22d546dd: ({ #d121c0bd: 259 }, <#ea323187>)>,
+        <#22d546dd: ({ #d121c0bd: 260 }, <#2fe155d3>)>,
+        <#22d546dd: ({ #d121c0bd: 261 }, <#f65b235f>)>,
         <#d80cb60b: ({ #d121c0bd: 262 }, 263)>,
+        <#d3d219f7: ({ #d121c0bd: 264 }, { #c1127ea9: 11, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 265 }, { #c1127ea9: 201, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 266 }, { #c1127ea9: 201 })>,
+        <#d80cb60b: ({ #d121c0bd: 267 }, 268)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 264 },
-            { #cd26765d: { #c1127ea9: 262 }, #11302019: 24 },
+           ({ #d121c0bd: 269 },
+            { #cd26765d: { #c1127ea9: 267 }, #11302019: 24 },
             1)>,
         <#d80cb60b: ({ #d121c0bd: 8 }, 7)>,
         <#d80cb60b: ({ #d121c0bd: 25 }, 24)>,
@@ -3194,10 +3199,10 @@
             { #f9c96be9: { #c1127ea9: 100 } },
             { #08ec7593: [ { #c1127ea9: 11 }, { #c1127ea9: 11 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 265 }, { #f9c96be9: { #c1127ea9: 100 } }, { })>,
+           ({ #d121c0bd: 270 }, { #f9c96be9: { #c1127ea9: 100 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 18 }, { #c1127ea9: 8, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 266 },
+           ({ #d121c0bd: 271 },
             { #f9c96be9: { #c1127ea9: 100 } },
             { #08ec7593: [ { #c1127ea9: 18 } ] })>,
         <#26796f6a:
@@ -3206,7 +3211,7 @@
             { #08ec7593: [ { #c1127ea9: 18 } ] })>,
         <#295746e6: ({ #d121c0bd: 22 }, { #c1127ea9: 8 })>,
         <#26796f6a:
-           ({ #d121c0bd: 267 },
+           ({ #d121c0bd: 272 },
             { #f9c96be9: { #c1127ea9: 100 } },
             { #08ec7593: [ { #c1127ea9: 22 } ] })>,
         <#26796f6a:
@@ -3215,35 +3220,35 @@
             { #08ec7593: [ { #c1127ea9: 22 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 13 }, { #f9c96be9: { #c1127ea9: 100 } }, { })>,
-        <#d3d219f7: ({ #d121c0bd: 268 }, { #c1127ea9: 269 })>,
+        <#d3d219f7: ({ #d121c0bd: 273 }, { #c1127ea9: 274 })>,
         <#d3d219f7: ({ #d121c0bd: 60 }, { #c1127ea9: 11 })>,
         <#26796f6a:
-           ({ #d121c0bd: 121 },
-            { #f9c96be9: { #c1127ea9: 130 } },
+           ({ #d121c0bd: 123 },
+            { #f9c96be9: { #c1127ea9: 134 } },
             { #08ec7593: [ { #c1127ea9: 67 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 179 },
+           ({ #d121c0bd: 183 },
             { #f9c96be9: { #c1127ea9: 100 } },
-            { #08ec7593: [ { #c1127ea9: 130 } ] })>,
+            { #08ec7593: [ { #c1127ea9: 134 } ] })>,
         <#26796f6a:
-           ({ #d121c0bd: 128 },
+           ({ #d121c0bd: 132 },
             { #f9c96be9: { #c1127ea9: 100 } },
-            { #08ec7593: [ { #c1127ea9: 130 } ] })>,
-        <#f3f3711a: ({ #d121c0bd: 270 })>,
-        <#f3f3711a: ({ #d121c0bd: 271 })>,
-        <#d3d219f7: ({ #d121c0bd: 272 }, { #c1127ea9: 270 })>,
-        <#d3d219f7: ({ #d121c0bd: 273 }, { #c1127ea9: 271 })>,
+            { #08ec7593: [ { #c1127ea9: 134 } ] })>,
+        <#f3f3711a: ({ #d121c0bd: 275 })>,
+        <#f3f3711a: ({ #d121c0bd: 276 })>,
+        <#d3d219f7: ({ #d121c0bd: 277 }, { #c1127ea9: 275 })>,
+        <#d3d219f7: ({ #d121c0bd: 278 }, { #c1127ea9: 276 })>,
         <#09e09de9: ({ #d121c0bd: 101, #26f32be5: 11 })>,
         <#d3d219f7: ({ #d121c0bd: 62 }, { #c1127ea9: 101 })>,
         <#da0c5ecf:
-           ({ #d121c0bd: 274 },
+           ({ #d121c0bd: 279 },
             { #cd26765d: { #c1127ea9: 11 }, #11302019: 4 },
             10)>,
-        <#f3f3711a: ({ #d121c0bd: 275 })>,
-        <#d3d219f7: ({ #d121c0bd: 276 }, { #c1127ea9: 275 })>,
+        <#f3f3711a: ({ #d121c0bd: 280 })>,
+        <#d3d219f7: ({ #d121c0bd: 281 }, { #c1127ea9: 280 })>,
         <#d3d219f7: ({ #d121c0bd: 72 }, { #c1127ea9: 8 })>,
-        <#f3f3711a: ({ #d121c0bd: 277 })>,
-        <#d3d219f7: ({ #d121c0bd: 278 }, { #c1127ea9: 277 })>,
+        <#f3f3711a: ({ #d121c0bd: 282 })>,
+        <#d3d219f7: ({ #d121c0bd: 283 }, { #c1127ea9: 282 })>,
         <#09e09de9: ({ #d121c0bd: 108, #26f32be5: 8 })>,
         <#d3d219f7: ({ #d121c0bd: 74 }, { #c1127ea9: 108 })>,
         <#da0c5ecf:
@@ -3251,12 +3256,12 @@
             { #cd26765d: { #c1127ea9: 8 }, #11302019: 4 },
             10)>,
         <#26796f6a:
-           ({ #d121c0bd: 279 }, { #f9c96be9: { #c1127ea9: 100 } }, { })>,
-        <#f3f3711a: ({ #d121c0bd: 280 })>,
-        <#d3d219f7: ({ #d121c0bd: 281 }, { #c1127ea9: 280 })>,
+           ({ #d121c0bd: 284 }, { #f9c96be9: { #c1127ea9: 100 } }, { })>,
+        <#f3f3711a: ({ #d121c0bd: 285 })>,
+        <#d3d219f7: ({ #d121c0bd: 286 }, { #c1127ea9: 285 })>,
         <#0b08cd60: ({ #d121c0bd: 49 }, { #c1127ea9: 25, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 282 },
+           ({ #d121c0bd: 287 },
             { #f9c96be9: { #c1127ea9: 100 } },
             { #08ec7593: [ { #c1127ea9: 49 } ] })>,
         <#26796f6a:
@@ -3265,15 +3270,15 @@
             { #08ec7593: [ { #c1127ea9: 49 } ] })>,
         <#295746e6: ({ #d121c0bd: 53 }, { #c1127ea9: 25 })>,
         <#26796f6a:
-           ({ #d121c0bd: 283 },
+           ({ #d121c0bd: 288 },
             { #f9c96be9: { #c1127ea9: 100 } },
             { #08ec7593: [ { #c1127ea9: 53 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 51 },
             { #f9c96be9: { #c1127ea9: 100 } },
             { #08ec7593: [ { #c1127ea9: 53 } ] })>,
-        <#f3f3711a: ({ #d121c0bd: 284 })>,
-        <#d3d219f7: ({ #d121c0bd: 285 }, { #c1127ea9: 284 })>,
+        <#f3f3711a: ({ #d121c0bd: 289 })>,
+        <#d3d219f7: ({ #d121c0bd: 290 }, { #c1127ea9: 289 })>,
         <#09e09de9: ({ #d121c0bd: 115, #26f32be5: 25 })>,
         <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 115 })>,
         <#da0c5ecf:
@@ -3281,63 +3286,63 @@
             { #cd26765d: { #c1127ea9: 25 }, #11302019: 12 },
             10)>,
         <#26796f6a:
-           ({ #d121c0bd: 286 }, { #f9c96be9: { #c1127ea9: 100 } }, { })>,
-        <#f3f3711a: ({ #d121c0bd: 287 })>,
-        <#d3d219f7: ({ #d121c0bd: 288 }, { #c1127ea9: 287 })>,
+           ({ #d121c0bd: 291 }, { #f9c96be9: { #c1127ea9: 100 } }, { })>,
+        <#f3f3711a: ({ #d121c0bd: 292 })>,
+        <#d3d219f7: ({ #d121c0bd: 293 }, { #c1127ea9: 292 })>,
         <#da0c5ecf:
-           ({ #d121c0bd: 144 },
+           ({ #d121c0bd: 148 },
             { #cd26765d: { #c1127ea9: 11 }, #11302019: 4 },
             3)>,
-        <#f3f3711a: ({ #d121c0bd: 289 })>,
-        <#d3d219f7: ({ #d121c0bd: 290 }, { #c1127ea9: 289 })>,
-        <#f3f3711a: ({ #d121c0bd: 291 })>,
-        <#d3d219f7: ({ #d121c0bd: 292 }, { #c1127ea9: 291 })>,
+        <#f3f3711a: ({ #d121c0bd: 294 })>,
+        <#d3d219f7: ({ #d121c0bd: 295 }, { #c1127ea9: 294 })>,
+        <#f3f3711a: ({ #d121c0bd: 296 })>,
+        <#d3d219f7: ({ #d121c0bd: 297 }, { #c1127ea9: 296 })>,
         <#da0c5ecf:
-           ({ #d121c0bd: 166 },
+           ({ #d121c0bd: 170 },
             { #cd26765d: { #c1127ea9: 25 }, #11302019: 12 },
             4)>,
-        <#f3f3711a: ({ #d121c0bd: 293 })>,
-        <#d3d219f7: ({ #d121c0bd: 294 }, { #c1127ea9: 293 })>,
+        <#f3f3711a: ({ #d121c0bd: 298 })>,
+        <#d3d219f7: ({ #d121c0bd: 299 }, { #c1127ea9: 298 })>,
         <#26796f6a:
-           ({ #d121c0bd: 295 },
-            { #f9c96be9: { #c1127ea9: 130 } },
+           ({ #d121c0bd: 300 },
+            { #f9c96be9: { #c1127ea9: 134 } },
             {
               #08ec7593: [
                 { #c1127ea9: 67 },
-                { #c1127ea9: 130 },
-                { #c1127ea9: 130 }
+                { #c1127ea9: 134 },
+                { #c1127ea9: 134 }
               ]
             })>,
         <#26796f6a:
-           ({ #d121c0bd: 169 },
-            { #f9c96be9: { #c1127ea9: 130 } },
+           ({ #d121c0bd: 173 },
+            { #f9c96be9: { #c1127ea9: 134 } },
             {
               #08ec7593: [
                 { #c1127ea9: 67 },
-                { #c1127ea9: 130 },
-                { #c1127ea9: 130 }
+                { #c1127ea9: 134 },
+                { #c1127ea9: 134 }
               ]
             })>,
         <#26796f6a:
-           ({ #d121c0bd: 296 },
+           ({ #d121c0bd: 301 },
             { #f9c96be9: { #c1127ea9: 100 } },
             {
               #08ec7593: [
-                { #c1127ea9: 130 },
-                { #c1127ea9: 130 },
-                { #c1127ea9: 130 }
+                { #c1127ea9: 134 },
+                { #c1127ea9: 134 },
+                { #c1127ea9: 134 }
               ]
             })>,
-        <#f3f3711a: ({ #d121c0bd: 297 })>,
-        <#d3d219f7: ({ #d121c0bd: 298 }, { #c1127ea9: 297 })>,
-        <#0098a8c5: ({ #d121c0bd: 299 }, { #fcd148e8: 252 })>,
-        <#2e3d736c: ({ #d121c0bd: 300 }, { #c1127ea9: 299 })>,
+        <#f3f3711a: ({ #d121c0bd: 302 })>,
+        <#d3d219f7: ({ #d121c0bd: 303 }, { #c1127ea9: 302 })>,
+        <#0098a8c5: ({ #d121c0bd: 304 }, { #fcd148e8: 256 })>,
+        <#2e3d736c: ({ #d121c0bd: 305 }, { #c1127ea9: 304 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 301, #26f32be5: 300 },
-            { #0b680f7d: { #c1127ea9: 300 }, #c3687459: 302 })>,
+           ({ #d121c0bd: 306, #26f32be5: 305 },
+            { #0b680f7d: { #c1127ea9: 305 }, #c3687459: 307 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 195, #26f32be5: 300 },
-            { #0b680f7d: { #c1127ea9: 301 }, #c3687459: 194 })>,
+           ({ #d121c0bd: 199, #26f32be5: 305 },
+            { #0b680f7d: { #c1127ea9: 306 }, #c3687459: 198 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/no_except_expr.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/no_except_expr.cpp.exp
index d9d32251d..f2ffeb0ab 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/no_except_expr.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/no_except_expr.cpp.exp
@@ -255,31 +255,32 @@
         <#d3d219f7: ({ #d121c0bd: 85 }, { #c1127ea9: 21 })>,
         <#22d546dd: ({ #d121c0bd: 86 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 87 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 88 }, 89)>,
-        <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 23, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 26, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 92 }, { #c1127ea9: 26 })>,
-        <#d80cb60b: ({ #d121c0bd: 93 }, 94)>,
+        <#22d546dd: ({ #d121c0bd: 88 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 89 }, 90)>,
+        <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 23, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 92 }, { #c1127ea9: 26, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 93 }, { #c1127ea9: 26 })>,
+        <#d80cb60b: ({ #d121c0bd: 94 }, 95)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 95 },
-            { #cd26765d: { #c1127ea9: 93 }, #11302019: 24 },
+           ({ #d121c0bd: 96 },
+            { #cd26765d: { #c1127ea9: 94 }, #11302019: 24 },
             1)>,
         <#26796f6a:
-           ({ #d121c0bd: 96 }, { #f9c96be9: { #c1127ea9: 21 } }, { })>,
+           ({ #d121c0bd: 97 }, { #f9c96be9: { #c1127ea9: 21 } }, { })>,
         <#26796f6a: ({ #d121c0bd: 8 }, { #f9c96be9: { #c1127ea9: 21 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 12 }, { #f9c96be9: { #c1127ea9: 23 } }, { })>,
-        <#d3d219f7: ({ #d121c0bd: 97 }, { #c1127ea9: 92 })>,
-        <#d3d219f7: ({ #d121c0bd: 98 }, { #c1127ea9: 96 })>,
+        <#d3d219f7: ({ #d121c0bd: 98 }, { #c1127ea9: 93 })>,
+        <#d3d219f7: ({ #d121c0bd: 99 }, { #c1127ea9: 97 })>,
         <#d3d219f7: ({ #d121c0bd: 20 }, { #c1127ea9: 8 })>,
-        <#0098a8c5: ({ #d121c0bd: 99 }, { #fcd148e8: 82 })>,
-        <#2e3d736c: ({ #d121c0bd: 100 }, { #c1127ea9: 99 })>,
+        <#0098a8c5: ({ #d121c0bd: 100 }, { #fcd148e8: 82 })>,
+        <#2e3d736c: ({ #d121c0bd: 101 }, { #c1127ea9: 100 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 101, #26f32be5: 100 },
-            { #0b680f7d: { #c1127ea9: 100 }, #c3687459: 102 })>,
+           ({ #d121c0bd: 102, #26f32be5: 101 },
+            { #0b680f7d: { #c1127ea9: 101 }, #c3687459: 103 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 25, #26f32be5: 100 },
-            { #0b680f7d: { #c1127ea9: 101 }, #c3687459: 24 })>,
+           ({ #d121c0bd: 25, #26f32be5: 101 },
+            { #0b680f7d: { #c1127ea9: 102 }, #c3687459: 24 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/objcpp_template_unboxing.mm.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/objcpp_template_unboxing.mm.exp
index d8efacc4a..a5b2c2d8e 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/objcpp_template_unboxing.mm.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/objcpp_template_unboxing.mm.exp
@@ -158,36 +158,37 @@
         <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 15 })>,
         <#22d546dd: ({ #d121c0bd: 78 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 79 }, <#2fe155d3>)>,
-        <#d3d219f7: ({ #d121c0bd: 80 }, { #c1127ea9: 76 })>,
-        <#0098a8c5: ({ #d121c0bd: 81 }, { #fcd148e8: 74 })>,
-        <#2e3d736c: ({ #d121c0bd: 82 }, { #c1127ea9: 81 })>,
-        <#0098a8c5: ({ #d121c0bd: 83 }, { #fcd148e8: 75 })>,
-        <#2e3d736c: ({ #d121c0bd: 84 }, { #c1127ea9: 83 })>,
-        <#2374f4e7: ({ #d121c0bd: 85 }, 8)>,
-        <#d80cb60b: ({ #d121c0bd: 86 }, 87)>,
-        <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 20, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 17, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 17 })>,
-        <#d80cb60b: ({ #d121c0bd: 91 }, 92)>,
+        <#22d546dd: ({ #d121c0bd: 80 }, <#f65b235f>)>,
+        <#d3d219f7: ({ #d121c0bd: 81 }, { #c1127ea9: 76 })>,
+        <#0098a8c5: ({ #d121c0bd: 82 }, { #fcd148e8: 74 })>,
+        <#2e3d736c: ({ #d121c0bd: 83 }, { #c1127ea9: 82 })>,
+        <#0098a8c5: ({ #d121c0bd: 84 }, { #fcd148e8: 75 })>,
+        <#2e3d736c: ({ #d121c0bd: 85 }, { #c1127ea9: 84 })>,
+        <#2374f4e7: ({ #d121c0bd: 86 }, 8)>,
+        <#d80cb60b: ({ #d121c0bd: 87 }, 88)>,
+        <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 20, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 17, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 17 })>,
+        <#d80cb60b: ({ #d121c0bd: 92 }, 93)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 93 },
-            { #cd26765d: { #c1127ea9: 91 }, #11302019: 24 },
+           ({ #d121c0bd: 94 },
+            { #cd26765d: { #c1127ea9: 92 }, #11302019: 24 },
             1)>,
-        <#f3f3711a: ({ #d121c0bd: 94 })>,
         <#f3f3711a: ({ #d121c0bd: 95 })>,
-        <#26796f6a:
-           ({ #d121c0bd: 96 },
-            { #f9c96be9: { #c1127ea9: 77 } },
-            { #08ec7593: [ { #c1127ea9: 94 } ] })>,
+        <#f3f3711a: ({ #d121c0bd: 96 })>,
         <#26796f6a:
            ({ #d121c0bd: 97 },
             { #f9c96be9: { #c1127ea9: 77 } },
             { #08ec7593: [ { #c1127ea9: 95 } ] })>,
+        <#26796f6a:
+           ({ #d121c0bd: 98 },
+            { #f9c96be9: { #c1127ea9: 77 } },
+            { #08ec7593: [ { #c1127ea9: 96 } ] })>,
         <#19e1ef85:
-           ({ #d121c0bd: 6, #26f32be5: 82 },
-            { #0b680f7d: { #c1127ea9: 82 }, #c3687459: 5 })>,
+           ({ #d121c0bd: 6, #26f32be5: 83 },
+            { #0b680f7d: { #c1127ea9: 83 }, #c3687459: 5 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 14, #26f32be5: 82 },
+           ({ #d121c0bd: 14, #26f32be5: 83 },
             { #0b680f7d: { #c1127ea9: 6 }, #c3687459: 13 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/optional.m.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/optional.m.exp
index 3ff8b64e5..00597546b 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/optional.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/optional.m.exp
@@ -960,36 +960,37 @@
         <#d3d219f7: ({ #d121c0bd: 110 }, { #c1127ea9: 17 })>,
         <#22d546dd: ({ #d121c0bd: 111 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 112 }, <#2fe155d3>)>,
-        <#d3d219f7: ({ #d121c0bd: 113 }, { #c1127ea9: 109 })>,
-        <#0098a8c5: ({ #d121c0bd: 114 }, { #fcd148e8: 107 })>,
-        <#2e3d736c: ({ #d121c0bd: 115 }, { #c1127ea9: 114 })>,
-        <#0098a8c5: ({ #d121c0bd: 116 }, { #fcd148e8: 108 })>,
-        <#2e3d736c: ({ #d121c0bd: 117 }, { #c1127ea9: 116 })>,
-        <#2374f4e7: ({ #d121c0bd: 118 }, 9)>,
-        <#d80cb60b: ({ #d121c0bd: 119 }, 120)>,
-        <#d3d219f7: ({ #d121c0bd: 121 }, { #c1127ea9: 56, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 122 }, { #c1127ea9: 53, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 123 }, { #c1127ea9: 53 })>,
-        <#d80cb60b: ({ #d121c0bd: 124 }, 125)>,
+        <#22d546dd: ({ #d121c0bd: 113 }, <#f65b235f>)>,
+        <#d3d219f7: ({ #d121c0bd: 114 }, { #c1127ea9: 109 })>,
+        <#0098a8c5: ({ #d121c0bd: 115 }, { #fcd148e8: 107 })>,
+        <#2e3d736c: ({ #d121c0bd: 116 }, { #c1127ea9: 115 })>,
+        <#0098a8c5: ({ #d121c0bd: 117 }, { #fcd148e8: 108 })>,
+        <#2e3d736c: ({ #d121c0bd: 118 }, { #c1127ea9: 117 })>,
+        <#2374f4e7: ({ #d121c0bd: 119 }, 9)>,
+        <#d80cb60b: ({ #d121c0bd: 120 }, 121)>,
+        <#d3d219f7: ({ #d121c0bd: 122 }, { #c1127ea9: 56, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 123 }, { #c1127ea9: 53, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 124 }, { #c1127ea9: 53 })>,
+        <#d80cb60b: ({ #d121c0bd: 125 }, 126)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 126 },
-            { #cd26765d: { #c1127ea9: 124 }, #11302019: 24 },
+           ({ #d121c0bd: 127 },
+            { #cd26765d: { #c1127ea9: 125 }, #11302019: 24 },
             1)>,
-        <#2374f4e7: ({ #d121c0bd: 127 }, 13)>,
+        <#2374f4e7: ({ #d121c0bd: 128 }, 13)>,
         <#19e1ef85:
-           ({ #d121c0bd: 7, #26f32be5: 115 },
-            { #0b680f7d: { #c1127ea9: 115 }, #c3687459: 6 })>,
+           ({ #d121c0bd: 7, #26f32be5: 116 },
+            { #0b680f7d: { #c1127ea9: 116 }, #c3687459: 6 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 51, #26f32be5: 115 },
+           ({ #d121c0bd: 51, #26f32be5: 116 },
             { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 50 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 5, #26f32be5: 113 },
-            { #0b680f7d: { #c1127ea9: 113 }, #c3687459: 4 })>,
-        <#2374f4e7: ({ #d121c0bd: 128 }, 20)>,
+           ({ #d121c0bd: 5, #26f32be5: 114 },
+            { #0b680f7d: { #c1127ea9: 114 }, #c3687459: 4 })>,
+        <#2374f4e7: ({ #d121c0bd: 129 }, 20)>,
         <#0098a8c5:
-           ({ #d121c0bd: 129 }, { #fcd148e8: 107, #0b037c51: [ 15 ] })>,
-        <#2e3d736c: ({ #d121c0bd: 22 }, { #c1127ea9: 129 })>,
-        <#2e3d736c: ({ #d121c0bd: 27 }, { #c1127ea9: 128 })>,
+           ({ #d121c0bd: 130 }, { #fcd148e8: 107, #0b037c51: [ 15 ] })>,
+        <#2e3d736c: ({ #d121c0bd: 22 }, { #c1127ea9: 130 })>,
+        <#2e3d736c: ({ #d121c0bd: 27 }, { #c1127ea9: 129 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/sizeof_static_evaluation.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/sizeof_static_evaluation.cpp.exp
index 22601de88..47abdcc75 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/sizeof_static_evaluation.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/sizeof_static_evaluation.cpp.exp
@@ -143,7 +143,7 @@
                 },
                 { #c1127ea9: 19 },
                 {
-                  #d2e9b40c: "800005863435481739",
+                  #d2e9b40c: "2670522532645241414",
                   #f1a45f0e: true,
                   #ebe3c415: 18,
                   #c11b7aa2:
@@ -160,7 +160,7 @@
           <#01fae064>,
           { #33244202: 8, #1a9a7e84: true, #fd16bc2f: true },
           { },
-          "2204753185921246810",
+          "",
           {
             #e43971cf: 7,
             #0de52551: [ <#37e21eda: { #c1127ea9: 21 }>, <#fae5d38c: "1"> ]
@@ -279,36 +279,37 @@
         <#d3d219f7: ({ #d121c0bd: 87 }, { #c1127ea9: 28 })>,
         <#22d546dd: ({ #d121c0bd: 88 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 89 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 90 }, 91)>,
-        <#d3d219f7: ({ #d121c0bd: 92 }, { #c1127ea9: 12, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 93 }, { #c1127ea9: 25, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 94 }, { #c1127ea9: 25 })>,
-        <#d80cb60b: ({ #d121c0bd: 95 }, 96)>,
+        <#22d546dd: ({ #d121c0bd: 90 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 91 }, 92)>,
+        <#d3d219f7: ({ #d121c0bd: 93 }, { #c1127ea9: 12, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 94 }, { #c1127ea9: 25, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 95 }, { #c1127ea9: 25 })>,
+        <#d80cb60b: ({ #d121c0bd: 96 }, 97)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 97 },
-            { #cd26765d: { #c1127ea9: 95 }, #11302019: 24 },
+           ({ #d121c0bd: 98 },
+            { #cd26765d: { #c1127ea9: 96 }, #11302019: 24 },
             1)>,
         <#f3f3711a: ({ #d121c0bd: 21 })>,
-        <#f3f3711a: ({ #d121c0bd: 98 })>,
-        <#ece2635f: ({ #d121c0bd: 99 })>,
+        <#f3f3711a: ({ #d121c0bd: 99 })>,
         <#ece2635f: ({ #d121c0bd: 100 })>,
-        <#d49f978d: ({ #d121c0bd: 101 })>,
+        <#ece2635f: ({ #d121c0bd: 101 })>,
+        <#d49f978d: ({ #d121c0bd: 102 })>,
         <#f3f3711a: ({ #d121c0bd: 16 })>,
-        <#ece2635f: ({ #d121c0bd: 102 })>,
         <#ece2635f: ({ #d121c0bd: 103 })>,
-        <#d49f978d: ({ #d121c0bd: 9 })>,
         <#ece2635f: ({ #d121c0bd: 104 })>,
-        <#d3d219f7: ({ #d121c0bd: 105 }, { #c1127ea9: 9 })>,
+        <#d49f978d: ({ #d121c0bd: 9 })>,
+        <#ece2635f: ({ #d121c0bd: 105 })>,
+        <#d3d219f7: ({ #d121c0bd: 106 }, { #c1127ea9: 9 })>,
         <#26796f6a:
            ({ #d121c0bd: 19 }, { #f9c96be9: { #c1127ea9: 28 } }, { })>,
-        <#0098a8c5: ({ #d121c0bd: 106 }, { #fcd148e8: 84 })>,
-        <#2e3d736c: ({ #d121c0bd: 107 }, { #c1127ea9: 106 })>,
+        <#0098a8c5: ({ #d121c0bd: 107 }, { #fcd148e8: 84 })>,
+        <#2e3d736c: ({ #d121c0bd: 108 }, { #c1127ea9: 107 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 108, #26f32be5: 107 },
-            { #0b680f7d: { #c1127ea9: 107 }, #c3687459: 109 })>,
+           ({ #d121c0bd: 109, #26f32be5: 108 },
+            { #0b680f7d: { #c1127ea9: 108 }, #c3687459: 110 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 27, #26f32be5: 107 },
-            { #0b680f7d: { #c1127ea9: 108 }, #c3687459: 26 })>,
+           ({ #d121c0bd: 27, #26f32be5: 108 },
+            { #0b680f7d: { #c1127ea9: 109 }, #c3687459: 26 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/struct.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/struct.cpp.exp
index ef6ffb3bc..7e0fdae05 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/struct.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/struct.cpp.exp
@@ -167,7 +167,7 @@
                                     },
                                     { #c1127ea9: 21 },
                                     {
-                                      #d2e9b40c: "4417717915555375243",
+                                      #d2e9b40c: "6288234584765134918",
                                       #f1a45f0e: true,
                                       #3e64314e: true,
                                       #ebe3c415: 20,
@@ -197,7 +197,7 @@
                                     },
                                     { #c1127ea9: 24 },
                                     {
-                                      #d2e9b40c: "4190573168950999278",
+                                      #d2e9b40c: "5359255322723102949",
                                       #f1a45f0e: true,
                                       #3e64314e: true,
                                       #d17ebeaa: [
@@ -232,7 +232,7 @@
                                     },
                                     { #c1127ea9: 28 },
                                     {
-                                      #d2e9b40c: "12437859369676964978",
+                                      #d2e9b40c: "18224946875082286891",
                                       #f1a45f0e: true,
                                       #3e64314e: true,
                                       #d17ebeaa: [
@@ -558,24 +558,25 @@
         <#d3d219f7: ({ #d121c0bd: 112 }, { #c1127ea9: 52 })>,
         <#22d546dd: ({ #d121c0bd: 113 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 114 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 115 }, 116)>,
-        <#d3d219f7: ({ #d121c0bd: 117 }, { #c1127ea9: 42, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 118 }, { #c1127ea9: 54, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 119 }, { #c1127ea9: 54 })>,
-        <#d80cb60b: ({ #d121c0bd: 120 }, 121)>,
+        <#22d546dd: ({ #d121c0bd: 115 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 116 }, 117)>,
+        <#d3d219f7: ({ #d121c0bd: 118 }, { #c1127ea9: 42, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 119 }, { #c1127ea9: 54, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 120 }, { #c1127ea9: 54 })>,
+        <#d80cb60b: ({ #d121c0bd: 121 }, 122)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 122 },
-            { #cd26765d: { #c1127ea9: 120 }, #11302019: 24 },
+           ({ #d121c0bd: 123 },
+            { #cd26765d: { #c1127ea9: 121 }, #11302019: 24 },
             1)>,
         <#d80cb60b: ({ #d121c0bd: 8 }, 7)>,
         <#26796f6a:
            ({ #d121c0bd: 14 }, { #f9c96be9: { #c1127ea9: 52 } }, { })>,
         <#d80cb60b: ({ #d121c0bd: 18 }, 17)>,
         <#26796f6a:
-           ({ #d121c0bd: 123 }, { #f9c96be9: { #c1127ea9: 52 } }, { })>,
+           ({ #d121c0bd: 124 }, { #f9c96be9: { #c1127ea9: 52 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 26 }, { #c1127ea9: 18, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 124 },
+           ({ #d121c0bd: 125 },
             { #f9c96be9: { #c1127ea9: 52 } },
             { #08ec7593: [ { #c1127ea9: 26 } ] })>,
         <#26796f6a:
@@ -584,7 +585,7 @@
             { #08ec7593: [ { #c1127ea9: 26 } ] })>,
         <#295746e6: ({ #d121c0bd: 30 }, { #c1127ea9: 18 })>,
         <#26796f6a:
-           ({ #d121c0bd: 125 },
+           ({ #d121c0bd: 126 },
             { #f9c96be9: { #c1127ea9: 52 } },
             { #08ec7593: [ { #c1127ea9: 30 } ] })>,
         <#26796f6a:
@@ -595,14 +596,14 @@
            ({ #d121c0bd: 21 }, { #f9c96be9: { #c1127ea9: 52 } }, { })>,
         <#d80cb60b: ({ #d121c0bd: 39 }, 38)>,
         <#d80cb60b: ({ #d121c0bd: 46 }, 45)>,
-        <#0098a8c5: ({ #d121c0bd: 126 }, { #fcd148e8: 109 })>,
-        <#2e3d736c: ({ #d121c0bd: 127 }, { #c1127ea9: 126 })>,
+        <#0098a8c5: ({ #d121c0bd: 127 }, { #fcd148e8: 109 })>,
+        <#2e3d736c: ({ #d121c0bd: 128 }, { #c1127ea9: 127 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 128, #26f32be5: 127 },
-            { #0b680f7d: { #c1127ea9: 127 }, #c3687459: 129 })>,
+           ({ #d121c0bd: 129, #26f32be5: 128 },
+            { #0b680f7d: { #c1127ea9: 128 }, #c3687459: 130 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 51, #26f32be5: 127 },
-            { #0b680f7d: { #c1127ea9: 128 }, #c3687459: 50 })>,
+           ({ #d121c0bd: 51, #26f32be5: 128 },
+            { #0b680f7d: { #c1127ea9: 129 }, #c3687459: 50 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/template_instantiations.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/template_instantiations.cpp.exp
index 600204da8..7fad5c70c 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/template_instantiations.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/template_instantiations.cpp.exp
@@ -64,7 +64,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 0 },
                   { },
-                  "2296961816144140105",
+                  "",
                   {
                     #e43971cf: 7,
                     #0de52551: [
@@ -116,7 +116,7 @@
                         },
                         { #c1127ea9: 15 },
                         {
-                          #d2e9b40c: "16263929779680628849",
+                          #d2e9b40c: "15507823120941368224",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #ebe3c415: 14,
@@ -144,7 +144,7 @@
                         },
                         { #c1127ea9: 18 },
                         {
-                          #d2e9b40c: "11014497521477142187",
+                          #d2e9b40c: "651618469270041090",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -174,7 +174,7 @@
                         },
                         { #c1127ea9: 22 },
                         {
-                          #d2e9b40c: "15031955784438883279",
+                          #d2e9b40c: "14649822005097330172",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -195,7 +195,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 11, #1a9a7e84: true },
                   { #f1ae3b70: true },
-                  "8342447397680512296",
+                  "",
                   {
                     #e43971cf: 7,
                     #0de52551: [
@@ -304,7 +304,7 @@
                         },
                         { #c1127ea9: 15 },
                         {
-                          #d2e9b40c: "10023818314310534501",
+                          #d2e9b40c: "9282946488688737892",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #ebe3c415: 34,
@@ -334,7 +334,7 @@
                         },
                         { #c1127ea9: 37 },
                         {
-                          #d2e9b40c: "11471169980769644070",
+                          #d2e9b40c: "4835163870722214719",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -366,7 +366,7 @@
                         },
                         { #c1127ea9: 41 },
                         {
-                          #d2e9b40c: "11154857410366551354",
+                          #d2e9b40c: "14658047667100730153",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -387,7 +387,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 31, #1a9a7e84: true },
                   { #f1ae3b70: true },
-                  "11141543725649308068",
+                  "",
                   { #e43971cf: 30, #0de52551: [ <#ea323187> ] })>
             ]
           })>,
@@ -480,7 +480,7 @@
                         },
                         { #c1127ea9: 15 },
                         {
-                          #d2e9b40c: "1478228132453016226",
+                          #d2e9b40c: "18054455536952808167",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #ebe3c415: 51,
@@ -508,7 +508,7 @@
                         },
                         { #c1127ea9: 54 },
                         {
-                          #d2e9b40c: "11043804702208708385",
+                          #d2e9b40c: "12602934757794480668",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -538,7 +538,7 @@
                         },
                         { #c1127ea9: 58 },
                         {
-                          #d2e9b40c: "5185260157533638819",
+                          #d2e9b40c: "3579925925305368200",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -559,7 +559,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 48, #1a9a7e84: true },
                   { #f1ae3b70: true },
-                  "18441911275316219119",
+                  "",
                   { #e43971cf: 47, #0de52551: [ <#fae5d38c: "0"> ] })>
             ]
           })>,
@@ -621,7 +621,7 @@
                         },
                         { #c1127ea9: 15 },
                         {
-                          #d2e9b40c: "16225353893069217924",
+                          #d2e9b40c: "16721342488904302213",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #ebe3c415: 65,
@@ -649,7 +649,7 @@
                         },
                         { #c1127ea9: 68 },
                         {
-                          #d2e9b40c: "16636418989297388895",
+                          #d2e9b40c: "6201193260347400774",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -679,7 +679,7 @@
                         },
                         { #c1127ea9: 72 },
                         {
-                          #d2e9b40c: "2774670671732909065",
+                          #d2e9b40c: "17328475686832768154",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -700,7 +700,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 62, #1a9a7e84: true },
                   { #f1ae3b70: true },
-                  "7893038887469539829",
+                  "",
                   { #e43971cf: 61, #0de52551: [ <#fae5d38c: "99"> ] })>
             ]
           })>,
@@ -766,7 +766,7 @@
                         },
                         { #c1127ea9: 15 },
                         {
-                          #d2e9b40c: "16125716847522929195",
+                          #d2e9b40c: "17996233516732688870",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #ebe3c415: 79,
@@ -796,7 +796,7 @@
                         },
                         { #c1127ea9: 82 },
                         {
-                          #d2e9b40c: "5156418638880841616",
+                          #d2e9b40c: "8170411964911509925",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -828,7 +828,7 @@
                         },
                         { #c1127ea9: 86 },
                         {
-                          #d2e9b40c: "18073023600850944380",
+                          #d2e9b40c: "16625409861663294039",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -849,7 +849,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 76, #1a9a7e84: true },
                   { #f1ae3b70: true },
-                  "6282617124311682814",
+                  "",
                   {
                     #e43971cf: 75,
                     #0de52551: [ <#fae5d38c: "78187493520"> ]
@@ -994,7 +994,7 @@
                         { #c8ff724b: "X", #2cdb06fb: [ "X", "X<&x5>" ] },
                         { #c1127ea9: 15 },
                         {
-                          #d2e9b40c: "8438636393447290261",
+                          #d2e9b40c: "7942647797612205972",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #ebe3c415: 102,
@@ -1019,7 +1019,7 @@
                         { #c8ff724b: "X", #2cdb06fb: [ "X", "X<&x5>" ] },
                         { #c1127ea9: 105 },
                         {
-                          #d2e9b40c: "304459608885830774",
+                          #d2e9b40c: "13792914784228561871",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -1046,7 +1046,7 @@
                         { #c8ff724b: "X", #2cdb06fb: [ "X", "X<&x5>" ] },
                         { #c1127ea9: 109 },
                         {
-                          #d2e9b40c: "5555169503117312650",
+                          #d2e9b40c: "6395019852822673209",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -1067,7 +1067,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 99, #1a9a7e84: true },
                   { #f1ae3b70: true },
-                  "92945586264616176",
+                  "",
                   { #e43971cf: 98, #0de52551: [ <#ca45bcda: 112> ] })>
             ]
           })>,
@@ -1119,7 +1119,7 @@
                 { #c8ff724b: "Y", #2cdb06fb: [ "Y", "Y" ] },
                 { #c1127ea9: 15 },
                 {
-                  #d2e9b40c: "14898916407379161639",
+                  #d2e9b40c: "16769433076588921314",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #ebe3c415: 117,
@@ -1143,7 +1143,7 @@
                 { #c8ff724b: "Y", #2cdb06fb: [ "Y", "Y" ] },
                 { #c1127ea9: 120 },
                 {
-                  #d2e9b40c: "7125450473324676530",
+                  #d2e9b40c: "18119742553314115417",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -1169,7 +1169,7 @@
                 { #c8ff724b: "Y", #2cdb06fb: [ "Y", "Y" ] },
                 { #c1127ea9: 124 },
                 {
-                  #d2e9b40c: "3069361207223136310",
+                  #d2e9b40c: "14901405322990444079",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -1207,7 +1207,7 @@
                       ({ #c7b317f4: 35, #c68b4ed6: 1 },
                        { #c7b317f4: 36, #c68b4ed6: 11 })
                   },
-                  { #c8ff724b: "Z", #2cdb06fb: [ "Z<&y>" ] },
+                  { #c8ff724b: "Z", #2cdb06fb: [ "Z<y>" ] },
                   129,
                   [
                     <#f50d797e:
@@ -1218,7 +1218,7 @@
                           #eb8a1f5a: true,
                           #0b0695a4: <#1b87f4c9>
                         },
-                        { #c8ff724b: "Z", #2cdb06fb: [ "Z", "Z<&y>" ] },
+                        { #c8ff724b: "Z", #2cdb06fb: [ "Z", "Z<y>" ] },
                         129,
                         [],
                         { },
@@ -1235,10 +1235,10 @@
                           #d3368c8a: true,
                           #0b0695a4: <#1b87f4c9>
                         },
-                        { #c8ff724b: "Z", #2cdb06fb: [ "Z", "Z<&y>" ] },
+                        { #c8ff724b: "Z", #2cdb06fb: [ "Z", "Z<y>" ] },
                         { #c1127ea9: 15 },
                         {
-                          #d2e9b40c: "2247315131692507250",
+                          #d2e9b40c: "499240077376103735",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #ebe3c415: 131,
@@ -1260,10 +1260,10 @@
                           #eb8a1f5a: true,
                           #0b0695a4: <#1b87f4c9>
                         },
-                        { #c8ff724b: "Z", #2cdb06fb: [ "Z", "Z<&y>" ] },
+                        { #c8ff724b: "Z", #2cdb06fb: [ "Z", "Z<y>" ] },
                         { #c1127ea9: 134 },
                         {
-                          #d2e9b40c: "7738251501016099665",
+                          #d2e9b40c: "17768891565958800780",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -1287,10 +1287,10 @@
                           #eb8a1f5a: true,
                           #0b0695a4: <#1b87f4c9>
                         },
-                        { #c8ff724b: "Z", #2cdb06fb: [ "Z", "Z<&y>" ] },
+                        { #c8ff724b: "Z", #2cdb06fb: [ "Z", "Z<y>" ] },
                         { #c1127ea9: 138 },
                         {
-                          #d2e9b40c: "15832834678910379731",
+                          #d2e9b40c: "5257127409284049912",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -1311,7 +1311,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 128, #1a9a7e84: true },
                   { #f1ae3b70: true },
-                  "4282980438553401163",
+                  "",
                   { #e43971cf: 127, #0de52551: [ <#ca45bcda: 141> ] })>
             ]
           })>,
@@ -1361,7 +1361,7 @@
                       ({ #c7b317f4: 39, #c68b4ed6: 1 },
                        { #c7b317f4: 40, #c68b4ed6: 11 })
                   },
-                  { #c8ff724b: "W", #2cdb06fb: [ "W<&b>" ] },
+                  { #c8ff724b: "W", #2cdb06fb: [ "W<b>" ] },
                   145,
                   [
                     <#f50d797e:
@@ -1372,7 +1372,7 @@
                           #eb8a1f5a: true,
                           #0b0695a4: <#1b87f4c9>
                         },
-                        { #c8ff724b: "W", #2cdb06fb: [ "W", "W<&b>" ] },
+                        { #c8ff724b: "W", #2cdb06fb: [ "W", "W<b>" ] },
                         145,
                         [],
                         { },
@@ -1389,10 +1389,10 @@
                           #d3368c8a: true,
                           #0b0695a4: <#1b87f4c9>
                         },
-                        { #c8ff724b: "W", #2cdb06fb: [ "W", "W<&b>" ] },
+                        { #c8ff724b: "W", #2cdb06fb: [ "W", "W<b>" ] },
                         { #c1127ea9: 15 },
                         {
-                          #d2e9b40c: "7772438286950717212",
+                          #d2e9b40c: "8268180592181082237",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #ebe3c415: 147,
@@ -1414,10 +1414,10 @@
                           #eb8a1f5a: true,
                           #0b0695a4: <#1b87f4c9>
                         },
-                        { #c8ff724b: "W", #2cdb06fb: [ "W", "W<&b>" ] },
+                        { #c8ff724b: "W", #2cdb06fb: [ "W", "W<b>" ] },
                         { #c1127ea9: 150 },
                         {
-                          #d2e9b40c: "10597356402107300951",
+                          #d2e9b40c: "15184425556926585790",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -1441,10 +1441,10 @@
                           #eb8a1f5a: true,
                           #0b0695a4: <#1b87f4c9>
                         },
-                        { #c8ff724b: "W", #2cdb06fb: [ "W", "W<&b>" ] },
+                        { #c8ff724b: "W", #2cdb06fb: [ "W", "W<b>" ] },
                         { #c1127ea9: 154 },
                         {
-                          #d2e9b40c: "9048930144420503889",
+                          #d2e9b40c: "2251022854406196514",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -1465,7 +1465,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 144, #1a9a7e84: true },
                   { #f1ae3b70: true },
-                  "632323835311287041",
+                  "",
                   { #e43971cf: 143, #0de52551: [ <#ca45bcda: 157> ] })>
             ]
           })>,
@@ -1551,7 +1551,7 @@
                         { #c8ff724b: "A", #2cdb06fb: [ "A", "A<&f>" ] },
                         { #c1127ea9: 15 },
                         {
-                          #d2e9b40c: "3658993291457928989",
+                          #d2e9b40c: "3162969511250741948",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #ebe3c415: 166,
@@ -1576,7 +1576,7 @@
                         { #c8ff724b: "A", #2cdb06fb: [ "A", "A<&f>" ] },
                         { #c1127ea9: 169 },
                         {
-                          #d2e9b40c: "18252192508176638302",
+                          #d2e9b40c: "943561519717330679",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -1603,7 +1603,7 @@
                         { #c8ff724b: "A", #2cdb06fb: [ "A", "A<&f>" ] },
                         { #c1127ea9: 173 },
                         {
-                          #d2e9b40c: "9481628931273708930",
+                          #d2e9b40c: "16348915219842036529",
                           #f1a45f0e: true,
                           #3e64314e: true,
                           #d17ebeaa: [
@@ -1624,7 +1624,7 @@
                   <#c5b1f8a9>,
                   { #33244202: 163, #1a9a7e84: true },
                   { #f1ae3b70: true },
-                  "6648620333758562824",
+                  "",
                   { #e43971cf: 162, #0de52551: [ <#ca45bcda: 159> ] })>
             ]
           })>,
@@ -1680,7 +1680,7 @@
                       #ec05e4a8: 131,
                       #c8ff724b: {
                         #c8ff724b: "Z",
-                        #2cdb06fb: [ "Z", "Z<&y>" ]
+                        #2cdb06fb: [ "Z", "Z<y>" ]
                       },
                       #30e4876a: { #c1127ea9: 15 }
                     }
@@ -1709,7 +1709,7 @@
                       #ec05e4a8: 147,
                       #c8ff724b: {
                         #c8ff724b: "W",
-                        #2cdb06fb: [ "W", "W<&b>" ]
+                        #2cdb06fb: [ "W", "W<b>" ]
                       },
                       #30e4876a: { #c1127ea9: 15 }
                     }
@@ -1827,33 +1827,34 @@
         <#d3d219f7: ({ #d121c0bd: 251 }, { #c1127ea9: 190 })>,
         <#22d546dd: ({ #d121c0bd: 252 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 253 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 254 }, 255)>,
-        <#d3d219f7: ({ #d121c0bd: 256 }, { #c1127ea9: 10, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 257 }, { #c1127ea9: 192, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 258 }, { #c1127ea9: 192 })>,
-        <#d80cb60b: ({ #d121c0bd: 259 }, 260)>,
+        <#22d546dd: ({ #d121c0bd: 254 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 255 }, 256)>,
+        <#d3d219f7: ({ #d121c0bd: 257 }, { #c1127ea9: 10, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 258 }, { #c1127ea9: 192, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 259 }, { #c1127ea9: 192 })>,
+        <#d80cb60b: ({ #d121c0bd: 260 }, 261)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 261 },
-            { #cd26765d: { #c1127ea9: 259 }, #11302019: 24 },
+           ({ #d121c0bd: 262 },
+            { #cd26765d: { #c1127ea9: 260 }, #11302019: 24 },
             1)>,
-        <#f3f3711a: ({ #d121c0bd: 262 })>,
         <#f3f3711a: ({ #d121c0bd: 263 })>,
-        <#109a76a0: ({ #d121c0bd: 264 })>,
+        <#f3f3711a: ({ #d121c0bd: 264 })>,
         <#109a76a0: ({ #d121c0bd: 265 })>,
-        <#ece2635f: ({ #d121c0bd: 266 })>,
+        <#109a76a0: ({ #d121c0bd: 266 })>,
         <#ece2635f: ({ #d121c0bd: 267 })>,
-        <#d49f978d: ({ #d121c0bd: 268 })>,
+        <#ece2635f: ({ #d121c0bd: 268 })>,
+        <#d49f978d: ({ #d121c0bd: 269 })>,
         <#d80cb60b: ({ #d121c0bd: 9 }, 8)>,
-        <#ece2635f: ({ #d121c0bd: 269, #26f32be5: 9 })>,
+        <#ece2635f: ({ #d121c0bd: 270, #26f32be5: 9 })>,
         <#d80cb60b: ({ #d121c0bd: 12 }, 11)>,
         <#ece2635f: ({ #d121c0bd: 26, #26f32be5: 12 })>,
-        <#26796f6a:
-           ({ #d121c0bd: 270 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 271 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
+        <#26796f6a:
+           ({ #d121c0bd: 272 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 20 }, { #c1127ea9: 12, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 272 },
+           ({ #d121c0bd: 273 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 20 } ] })>,
         <#26796f6a:
@@ -1862,7 +1863,7 @@
             { #08ec7593: [ { #c1127ea9: 20 } ] })>,
         <#295746e6: ({ #d121c0bd: 24 }, { #c1127ea9: 12 })>,
         <#26796f6a:
-           ({ #d121c0bd: 273 },
+           ({ #d121c0bd: 274 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 24 } ] })>,
         <#26796f6a:
@@ -1871,20 +1872,20 @@
             { #08ec7593: [ { #c1127ea9: 24 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 15 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
-        <#e3120d1e: ({ #d121c0bd: 274, #26f32be5: 252 }, { #c1127ea9: 252 })>,
+        <#e3120d1e: ({ #d121c0bd: 275, #26f32be5: 252 }, { #c1127ea9: 252 })>,
         <#19e1ef85:
            ({ #d121c0bd: 29, #26f32be5: 252 },
-            { #0b680f7d: { #c1127ea9: 274 }, #c3687459: 28 })>,
-        <#ece2635f: ({ #d121c0bd: 275 })>,
+            { #0b680f7d: { #c1127ea9: 275 }, #c3687459: 28 })>,
         <#ece2635f: ({ #d121c0bd: 276 })>,
-        <#d49f978d: ({ #d121c0bd: 277 })>,
+        <#ece2635f: ({ #d121c0bd: 277 })>,
+        <#d49f978d: ({ #d121c0bd: 278 })>,
         <#d80cb60b: ({ #d121c0bd: 32 }, 31)>,
         <#ece2635f: ({ #d121c0bd: 45, #26f32be5: 32 })>,
         <#26796f6a:
-           ({ #d121c0bd: 278 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
+           ({ #d121c0bd: 279 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 39 }, { #c1127ea9: 32, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 279 },
+           ({ #d121c0bd: 280 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 39 } ] })>,
         <#26796f6a:
@@ -1893,29 +1894,29 @@
             { #08ec7593: [ { #c1127ea9: 39 } ] })>,
         <#295746e6: ({ #d121c0bd: 43 }, { #c1127ea9: 32 })>,
         <#26796f6a:
-           ({ #d121c0bd: 280 },
+           ({ #d121c0bd: 281 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 43 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 41 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 43 } ] })>,
-        <#ece2635f: ({ #d121c0bd: 281 })>,
         <#ece2635f: ({ #d121c0bd: 282 })>,
-        <#d49f978d: ({ #d121c0bd: 283 })>,
-        <#ece2635f: ({ #d121c0bd: 284 })>,
+        <#ece2635f: ({ #d121c0bd: 283 })>,
+        <#d49f978d: ({ #d121c0bd: 284 })>,
         <#ece2635f: ({ #d121c0bd: 285 })>,
-        <#d49f978d: ({ #d121c0bd: 286 })>,
-        <#ece2635f: ({ #d121c0bd: 287 })>,
+        <#ece2635f: ({ #d121c0bd: 286 })>,
+        <#d49f978d: ({ #d121c0bd: 287 })>,
         <#ece2635f: ({ #d121c0bd: 288 })>,
-        <#d49f978d: ({ #d121c0bd: 289 })>,
+        <#ece2635f: ({ #d121c0bd: 289 })>,
+        <#d49f978d: ({ #d121c0bd: 290 })>,
         <#d80cb60b: ({ #d121c0bd: 49 }, 48)>,
         <#ece2635f: ({ #d121c0bd: 90, #26f32be5: 49 })>,
         <#26796f6a:
-           ({ #d121c0bd: 290 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
+           ({ #d121c0bd: 291 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 56 }, { #c1127ea9: 49, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 291 },
+           ({ #d121c0bd: 292 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 56 } ] })>,
         <#26796f6a:
@@ -1924,7 +1925,7 @@
             { #08ec7593: [ { #c1127ea9: 56 } ] })>,
         <#295746e6: ({ #d121c0bd: 60 }, { #c1127ea9: 49 })>,
         <#26796f6a:
-           ({ #d121c0bd: 292 },
+           ({ #d121c0bd: 293 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 60 } ] })>,
         <#26796f6a:
@@ -1934,10 +1935,10 @@
         <#d80cb60b: ({ #d121c0bd: 63 }, 62)>,
         <#ece2635f: ({ #d121c0bd: 93, #26f32be5: 63 })>,
         <#26796f6a:
-           ({ #d121c0bd: 293 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
+           ({ #d121c0bd: 294 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 70 }, { #c1127ea9: 63, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 294 },
+           ({ #d121c0bd: 295 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 70 } ] })>,
         <#26796f6a:
@@ -1946,7 +1947,7 @@
             { #08ec7593: [ { #c1127ea9: 70 } ] })>,
         <#295746e6: ({ #d121c0bd: 74 }, { #c1127ea9: 63 })>,
         <#26796f6a:
-           ({ #d121c0bd: 295 },
+           ({ #d121c0bd: 296 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 74 } ] })>,
         <#26796f6a:
@@ -1956,10 +1957,10 @@
         <#d80cb60b: ({ #d121c0bd: 77 }, 76)>,
         <#ece2635f: ({ #d121c0bd: 96, #26f32be5: 77 })>,
         <#26796f6a:
-           ({ #d121c0bd: 296 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
+           ({ #d121c0bd: 297 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 84 }, { #c1127ea9: 77, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 297 },
+           ({ #d121c0bd: 298 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 84 } ] })>,
         <#26796f6a:
@@ -1968,29 +1969,29 @@
             { #08ec7593: [ { #c1127ea9: 84 } ] })>,
         <#295746e6: ({ #d121c0bd: 88 }, { #c1127ea9: 77 })>,
         <#26796f6a:
-           ({ #d121c0bd: 298 },
+           ({ #d121c0bd: 299 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 88 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 86 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 88 } ] })>,
-        <#ece2635f: ({ #d121c0bd: 299 })>,
         <#ece2635f: ({ #d121c0bd: 300 })>,
-        <#d49f978d: ({ #d121c0bd: 301 })>,
+        <#ece2635f: ({ #d121c0bd: 301 })>,
+        <#d49f978d: ({ #d121c0bd: 302 })>,
         <#da0c5ecf:
            ({ #d121c0bd: 113 },
             { #cd26765d: { #c1127ea9: 10 }, #11302019: 4 },
             42)>,
         <#d80cb60b: ({ #d121c0bd: 115 }, 114)>,
         <#0b08cd60: ({ #d121c0bd: 122 }, { #c1127ea9: 115, #ea1a680e: true })>,
-        <#ece2635f: ({ #d121c0bd: 302 })>,
         <#ece2635f: ({ #d121c0bd: 303 })>,
-        <#d49f978d: ({ #d121c0bd: 304 })>,
+        <#ece2635f: ({ #d121c0bd: 304 })>,
+        <#d49f978d: ({ #d121c0bd: 305 })>,
         <#26796f6a:
-           ({ #d121c0bd: 305 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
+           ({ #d121c0bd: 306 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#26796f6a:
-           ({ #d121c0bd: 306 },
+           ({ #d121c0bd: 307 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 122 } ] })>,
         <#26796f6a:
@@ -1999,7 +2000,7 @@
             { #08ec7593: [ { #c1127ea9: 122 } ] })>,
         <#295746e6: ({ #d121c0bd: 126 }, { #c1127ea9: 115 })>,
         <#26796f6a:
-           ({ #d121c0bd: 307 },
+           ({ #d121c0bd: 308 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 126 } ] })>,
         <#26796f6a:
@@ -2010,30 +2011,30 @@
            ({ #d121c0bd: 158 },
             { #cd26765d: { #c1127ea9: 10 }, #11302019: 4 },
             5)>,
-        <#0c1e4fc4: ({ #d121c0bd: 308, #26f32be5: 158 }, { #c1127ea9: 158 })>,
-        <#0b08cd60: ({ #d121c0bd: 309 }, { #c1127ea9: 158 })>,
-        <#0b08cd60: ({ #d121c0bd: 310 }, { #c1127ea9: 308 })>,
-        <#ece2635f: ({ #d121c0bd: 311 })>,
+        <#0c1e4fc4: ({ #d121c0bd: 309, #26f32be5: 158 }, { #c1127ea9: 158 })>,
+        <#0b08cd60: ({ #d121c0bd: 310 }, { #c1127ea9: 158 })>,
+        <#0b08cd60: ({ #d121c0bd: 311 }, { #c1127ea9: 309 })>,
         <#ece2635f: ({ #d121c0bd: 312 })>,
-        <#d49f978d: ({ #d121c0bd: 313 })>,
+        <#ece2635f: ({ #d121c0bd: 313 })>,
+        <#d49f978d: ({ #d121c0bd: 314 })>,
         <#26796f6a:
            ({ #d121c0bd: 160 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 10 } ] })>,
-        <#0c1e4fc4: ({ #d121c0bd: 314, #26f32be5: 160 }, { #c1127ea9: 160 })>,
-        <#d3d219f7: ({ #d121c0bd: 315 }, { #c1127ea9: 160 })>,
-        <#d3d219f7: ({ #d121c0bd: 316 }, { #c1127ea9: 314 })>,
-        <#ece2635f: ({ #d121c0bd: 317 })>,
+        <#0c1e4fc4: ({ #d121c0bd: 315, #26f32be5: 160 }, { #c1127ea9: 160 })>,
+        <#d3d219f7: ({ #d121c0bd: 316 }, { #c1127ea9: 160 })>,
+        <#d3d219f7: ({ #d121c0bd: 317 }, { #c1127ea9: 315 })>,
         <#ece2635f: ({ #d121c0bd: 318 })>,
-        <#d49f978d: ({ #d121c0bd: 319 })>,
-        <#d3d219f7: ({ #d121c0bd: 320 }, { #c1127ea9: 10 })>,
+        <#ece2635f: ({ #d121c0bd: 319 })>,
+        <#d49f978d: ({ #d121c0bd: 320 })>,
+        <#d3d219f7: ({ #d121c0bd: 321 }, { #c1127ea9: 10 })>,
         <#d80cb60b: ({ #d121c0bd: 100 }, 99)>,
         <#ece2635f: ({ #d121c0bd: 177, #26f32be5: 100 })>,
         <#26796f6a:
-           ({ #d121c0bd: 321 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
+           ({ #d121c0bd: 322 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 107 }, { #c1127ea9: 100, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 322 },
+           ({ #d121c0bd: 323 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 107 } ] })>,
         <#26796f6a:
@@ -2042,7 +2043,7 @@
             { #08ec7593: [ { #c1127ea9: 107 } ] })>,
         <#295746e6: ({ #d121c0bd: 111 }, { #c1127ea9: 100 })>,
         <#26796f6a:
-           ({ #d121c0bd: 323 },
+           ({ #d121c0bd: 324 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 111 } ] })>,
         <#26796f6a:
@@ -2052,10 +2053,10 @@
         <#d80cb60b: ({ #d121c0bd: 129 }, 128)>,
         <#ece2635f: ({ #d121c0bd: 180, #26f32be5: 129 })>,
         <#26796f6a:
-           ({ #d121c0bd: 324 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
+           ({ #d121c0bd: 325 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 136 }, { #c1127ea9: 129, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 325 },
+           ({ #d121c0bd: 326 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 136 } ] })>,
         <#26796f6a:
@@ -2064,7 +2065,7 @@
             { #08ec7593: [ { #c1127ea9: 136 } ] })>,
         <#295746e6: ({ #d121c0bd: 140 }, { #c1127ea9: 129 })>,
         <#26796f6a:
-           ({ #d121c0bd: 326 },
+           ({ #d121c0bd: 327 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 140 } ] })>,
         <#26796f6a:
@@ -2074,10 +2075,10 @@
         <#d80cb60b: ({ #d121c0bd: 145 }, 144)>,
         <#ece2635f: ({ #d121c0bd: 183, #26f32be5: 145 })>,
         <#26796f6a:
-           ({ #d121c0bd: 327 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
+           ({ #d121c0bd: 328 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 152 }, { #c1127ea9: 145, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 328 },
+           ({ #d121c0bd: 329 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 152 } ] })>,
         <#26796f6a:
@@ -2086,7 +2087,7 @@
             { #08ec7593: [ { #c1127ea9: 152 } ] })>,
         <#295746e6: ({ #d121c0bd: 156 }, { #c1127ea9: 145 })>,
         <#26796f6a:
-           ({ #d121c0bd: 329 },
+           ({ #d121c0bd: 330 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 156 } ] })>,
         <#26796f6a:
@@ -2096,10 +2097,10 @@
         <#d80cb60b: ({ #d121c0bd: 164 }, 163)>,
         <#ece2635f: ({ #d121c0bd: 186, #26f32be5: 164 })>,
         <#26796f6a:
-           ({ #d121c0bd: 330 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
+           ({ #d121c0bd: 331 }, { #f9c96be9: { #c1127ea9: 190 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 171 }, { #c1127ea9: 164, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 331 },
+           ({ #d121c0bd: 332 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 171 } ] })>,
         <#26796f6a:
@@ -2108,21 +2109,21 @@
             { #08ec7593: [ { #c1127ea9: 171 } ] })>,
         <#295746e6: ({ #d121c0bd: 175 }, { #c1127ea9: 164 })>,
         <#26796f6a:
-           ({ #d121c0bd: 332 },
+           ({ #d121c0bd: 333 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 175 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 173 },
             { #f9c96be9: { #c1127ea9: 190 } },
             { #08ec7593: [ { #c1127ea9: 175 } ] })>,
-        <#0098a8c5: ({ #d121c0bd: 333 }, { #fcd148e8: 248 })>,
-        <#2e3d736c: ({ #d121c0bd: 334 }, { #c1127ea9: 333 })>,
+        <#0098a8c5: ({ #d121c0bd: 334 }, { #fcd148e8: 248 })>,
+        <#2e3d736c: ({ #d121c0bd: 335 }, { #c1127ea9: 334 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 335, #26f32be5: 334 },
-            { #0b680f7d: { #c1127ea9: 334 }, #c3687459: 336 })>,
+           ({ #d121c0bd: 336, #26f32be5: 335 },
+            { #0b680f7d: { #c1127ea9: 335 }, #c3687459: 337 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 189, #26f32be5: 334 },
-            { #0b680f7d: { #c1127ea9: 335 }, #c3687459: 188 })>,
+           ({ #d121c0bd: 189, #26f32be5: 335 },
+            { #0b680f7d: { #c1127ea9: 336 }, #c3687459: 188 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/this.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/this.cpp.exp
index c226a8c63..4031db5c3 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/this.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/this.cpp.exp
@@ -250,27 +250,28 @@
         <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 22 })>,
         <#22d546dd: ({ #d121c0bd: 84 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 85 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 86 }, 87)>,
-        <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 11, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 24, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 24 })>,
-        <#d80cb60b: ({ #d121c0bd: 91 }, 92)>,
+        <#22d546dd: ({ #d121c0bd: 86 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 87 }, 88)>,
+        <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 11, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 24, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 24 })>,
+        <#d80cb60b: ({ #d121c0bd: 92 }, 93)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 93 },
-            { #cd26765d: { #c1127ea9: 91 }, #11302019: 24 },
+           ({ #d121c0bd: 94 },
+            { #cd26765d: { #c1127ea9: 92 }, #11302019: 24 },
             1)>,
         <#d80cb60b: ({ #d121c0bd: 8 }, 7)>,
         <#d3d219f7: ({ #d121c0bd: 18 }, { #c1127ea9: 8 })>,
         <#26796f6a:
            ({ #d121c0bd: 13 }, { #f9c96be9: { #c1127ea9: 22 } }, { })>,
-        <#0098a8c5: ({ #d121c0bd: 94 }, { #fcd148e8: 80 })>,
-        <#2e3d736c: ({ #d121c0bd: 95 }, { #c1127ea9: 94 })>,
+        <#0098a8c5: ({ #d121c0bd: 95 }, { #fcd148e8: 80 })>,
+        <#2e3d736c: ({ #d121c0bd: 96 }, { #c1127ea9: 95 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 96, #26f32be5: 95 },
-            { #0b680f7d: { #c1127ea9: 95 }, #c3687459: 97 })>,
+           ({ #d121c0bd: 97, #26f32be5: 96 },
+            { #0b680f7d: { #c1127ea9: 96 }, #c3687459: 98 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 21, #26f32be5: 95 },
-            { #0b680f7d: { #c1127ea9: 96 }, #c3687459: 20 })>,
+           ({ #d121c0bd: 21, #26f32be5: 96 },
+            { #0b680f7d: { #c1127ea9: 97 }, #c3687459: 20 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/type_trait.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/type_trait.cpp.exp
index 0d8fda0f2..266212327 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/type_trait.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/type_trait.cpp.exp
@@ -154,7 +154,7 @@
                 { #c8ff724b: "~X", #2cdb06fb: [ "~X", "X" ] },
                 { #c1127ea9: 22 },
                 {
-                  #d2e9b40c: "9850251229546392500",
+                  #d2e9b40c: "10975959821506117086",
                   #f1a45f0e: true,
                   #3e64314e: true
                 },
@@ -480,55 +480,56 @@
         <#d3d219f7: ({ #d121c0bd: 106 }, { #c1127ea9: 46 })>,
         <#22d546dd: ({ #d121c0bd: 107 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 108 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 109 }, 110)>,
-        <#d3d219f7: ({ #d121c0bd: 111 }, { #c1127ea9: 30, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 112 }, { #c1127ea9: 47, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 113 }, { #c1127ea9: 47 })>,
-        <#d80cb60b: ({ #d121c0bd: 114 }, 115)>,
+        <#22d546dd: ({ #d121c0bd: 109 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 110 }, 111)>,
+        <#d3d219f7: ({ #d121c0bd: 112 }, { #c1127ea9: 30, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 113 }, { #c1127ea9: 47, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 114 }, { #c1127ea9: 47 })>,
+        <#d80cb60b: ({ #d121c0bd: 115 }, 116)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 116 },
-            { #cd26765d: { #c1127ea9: 114 }, #11302019: 24 },
+           ({ #d121c0bd: 117 },
+            { #cd26765d: { #c1127ea9: 115 }, #11302019: 24 },
             1)>,
         <#d80cb60b: ({ #d121c0bd: 8 }, 7)>,
-        <#d3d219f7: ({ #d121c0bd: 117 }, { #c1127ea9: 8 })>,
+        <#d3d219f7: ({ #d121c0bd: 118 }, { #c1127ea9: 8 })>,
         <#26796f6a:
            ({ #d121c0bd: 11 }, { #f9c96be9: { #c1127ea9: 46 } }, { })>,
-        <#0b08cd60: ({ #d121c0bd: 118 }, { #c1127ea9: 8 })>,
+        <#0b08cd60: ({ #d121c0bd: 119 }, { #c1127ea9: 8 })>,
         <#0b08cd60: ({ #d121c0bd: 16 }, { #c1127ea9: 8, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 119 },
-            { #f9c96be9: { #c1127ea9: 118 } },
+           ({ #d121c0bd: 120 },
+            { #f9c96be9: { #c1127ea9: 119 } },
             { #08ec7593: [ { #c1127ea9: 16 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 14 },
-            { #f9c96be9: { #c1127ea9: 118 } },
+            { #f9c96be9: { #c1127ea9: 119 } },
             { #08ec7593: [ { #c1127ea9: 16 } ] })>,
         <#295746e6: ({ #d121c0bd: 20 }, { #c1127ea9: 8 })>,
         <#26796f6a:
-           ({ #d121c0bd: 120 },
-            { #f9c96be9: { #c1127ea9: 118 } },
+           ({ #d121c0bd: 121 },
+            { #f9c96be9: { #c1127ea9: 119 } },
             { #08ec7593: [ { #c1127ea9: 20 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 18 },
-            { #f9c96be9: { #c1127ea9: 118 } },
+            { #f9c96be9: { #c1127ea9: 119 } },
             { #08ec7593: [ { #c1127ea9: 20 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 22 }, { #f9c96be9: { #c1127ea9: 46 } }, { })>,
-        <#f3f3711a: ({ #d121c0bd: 121 })>,
         <#f3f3711a: ({ #d121c0bd: 122 })>,
+        <#f3f3711a: ({ #d121c0bd: 123 })>,
         <#26796f6a:
            ({ #d121c0bd: 25 }, { #f9c96be9: { #c1127ea9: 29 } }, { })>,
         <#d3d219f7: ({ #d121c0bd: 39 }, { #c1127ea9: 25 })>,
-        <#dd64b59b: ({ #d121c0bd: 123, #26f32be5: 30 })>,
-        <#dd64b59b: ({ #d121c0bd: 124, #26f32be5: 8 })>,
-        <#0098a8c5: ({ #d121c0bd: 125 }, { #fcd148e8: 103 })>,
-        <#2e3d736c: ({ #d121c0bd: 126 }, { #c1127ea9: 125 })>,
+        <#dd64b59b: ({ #d121c0bd: 124, #26f32be5: 30 })>,
+        <#dd64b59b: ({ #d121c0bd: 125, #26f32be5: 8 })>,
+        <#0098a8c5: ({ #d121c0bd: 126 }, { #fcd148e8: 103 })>,
+        <#2e3d736c: ({ #d121c0bd: 127 }, { #c1127ea9: 126 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 127, #26f32be5: 126 },
-            { #0b680f7d: { #c1127ea9: 126 }, #c3687459: 128 })>,
+           ({ #d121c0bd: 128, #26f32be5: 127 },
+            { #0b680f7d: { #c1127ea9: 127 }, #c3687459: 129 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 45, #26f32be5: 126 },
-            { #0b680f7d: { #c1127ea9: 127 }, #c3687459: 44 })>,
+           ({ #d121c0bd: 45, #26f32be5: 127 },
+            { #0b680f7d: { #c1127ea9: 128 }, #c3687459: 44 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/unresolved_lookup.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/unresolved_lookup.cpp.exp
index a2b9b9941..d322e69b6 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/unresolved_lookup.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/unresolved_lookup.cpp.exp
@@ -131,42 +131,43 @@
         <#d3d219f7: ({ #d121c0bd: 72 }, { #c1127ea9: 10 })>,
         <#22d546dd: ({ #d121c0bd: 73 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 74 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 75 }, 76)>,
-        <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 15, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 12, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 79 }, { #c1127ea9: 12 })>,
-        <#d80cb60b: ({ #d121c0bd: 80 }, 81)>,
+        <#22d546dd: ({ #d121c0bd: 75 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 76 }, 77)>,
+        <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 15, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 79 }, { #c1127ea9: 12, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 80 }, { #c1127ea9: 12 })>,
+        <#d80cb60b: ({ #d121c0bd: 81 }, 82)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 82 },
-            { #cd26765d: { #c1127ea9: 80 }, #11302019: 24 },
+           ({ #d121c0bd: 83 },
+            { #cd26765d: { #c1127ea9: 81 }, #11302019: 24 },
             1)>,
-        <#f3f3711a: ({ #d121c0bd: 83 })>,
         <#f3f3711a: ({ #d121c0bd: 84 })>,
-        <#ece2635f: ({ #d121c0bd: 85 })>,
+        <#f3f3711a: ({ #d121c0bd: 85 })>,
         <#ece2635f: ({ #d121c0bd: 86 })>,
-        <#d49f978d: ({ #d121c0bd: 87 })>,
-        <#f3f3711a: ({ #d121c0bd: 88 })>,
+        <#ece2635f: ({ #d121c0bd: 87 })>,
+        <#d49f978d: ({ #d121c0bd: 88 })>,
         <#f3f3711a: ({ #d121c0bd: 89 })>,
-        <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 88 })>,
+        <#f3f3711a: ({ #d121c0bd: 90 })>,
         <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 89 })>,
-        <#d3d219f7: ({ #d121c0bd: 92 }, { #c1127ea9: 87 })>,
-        <#26796f6a:
-           ({ #d121c0bd: 93 },
-            { #f9c96be9: { #c1127ea9: 15 } },
-            { #08ec7593: [ { #c1127ea9: 90 } ] })>,
+        <#d3d219f7: ({ #d121c0bd: 92 }, { #c1127ea9: 90 })>,
+        <#d3d219f7: ({ #d121c0bd: 93 }, { #c1127ea9: 88 })>,
         <#26796f6a:
            ({ #d121c0bd: 94 },
             { #f9c96be9: { #c1127ea9: 15 } },
             { #08ec7593: [ { #c1127ea9: 91 } ] })>,
-        <#ece2635f: ({ #d121c0bd: 95, #26f32be5: 87 })>,
-        <#0098a8c5: ({ #d121c0bd: 96 }, { #fcd148e8: 69 })>,
-        <#2e3d736c: ({ #d121c0bd: 97 }, { #c1127ea9: 96 })>,
+        <#26796f6a:
+           ({ #d121c0bd: 95 },
+            { #f9c96be9: { #c1127ea9: 15 } },
+            { #08ec7593: [ { #c1127ea9: 92 } ] })>,
+        <#ece2635f: ({ #d121c0bd: 96, #26f32be5: 88 })>,
+        <#0098a8c5: ({ #d121c0bd: 97 }, { #fcd148e8: 69 })>,
+        <#2e3d736c: ({ #d121c0bd: 98 }, { #c1127ea9: 97 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 98, #26f32be5: 97 },
-            { #0b680f7d: { #c1127ea9: 97 }, #c3687459: 99 })>,
+           ({ #d121c0bd: 99, #26f32be5: 98 },
+            { #0b680f7d: { #c1127ea9: 98 }, #c3687459: 100 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 9, #26f32be5: 97 },
-            { #0b680f7d: { #c1127ea9: 98 }, #c3687459: 8 })>,
+           ({ #d121c0bd: 9, #26f32be5: 98 },
+            { #0b680f7d: { #c1127ea9: 99 }, #c3687459: 8 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/using_directive.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/using_directive.cpp.exp
index d67d3e43b..1cc836797 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/using_directive.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/using_directive.cpp.exp
@@ -251,23 +251,24 @@
         <#d3d219f7: ({ #d121c0bd: 79 }, { #c1127ea9: 18 })>,
         <#22d546dd: ({ #d121c0bd: 80 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 81 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 82 }, 83)>,
-        <#d3d219f7: ({ #d121c0bd: 84 }, { #c1127ea9: 10, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 85 }, { #c1127ea9: 20, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 86 }, { #c1127ea9: 20 })>,
-        <#d80cb60b: ({ #d121c0bd: 87 }, 88)>,
+        <#22d546dd: ({ #d121c0bd: 82 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 83 }, 84)>,
+        <#d3d219f7: ({ #d121c0bd: 85 }, { #c1127ea9: 10, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 86 }, { #c1127ea9: 20, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 87 }, { #c1127ea9: 20 })>,
+        <#d80cb60b: ({ #d121c0bd: 88 }, 89)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 89 },
-            { #cd26765d: { #c1127ea9: 87 }, #11302019: 24 },
+           ({ #d121c0bd: 90 },
+            { #cd26765d: { #c1127ea9: 88 }, #11302019: 24 },
             1)>,
-        <#0098a8c5: ({ #d121c0bd: 90 }, { #fcd148e8: 76 })>,
-        <#2e3d736c: ({ #d121c0bd: 91 }, { #c1127ea9: 90 })>,
+        <#0098a8c5: ({ #d121c0bd: 91 }, { #fcd148e8: 76 })>,
+        <#2e3d736c: ({ #d121c0bd: 92 }, { #c1127ea9: 91 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 92, #26f32be5: 91 },
-            { #0b680f7d: { #c1127ea9: 91 }, #c3687459: 93 })>,
+           ({ #d121c0bd: 93, #26f32be5: 92 },
+            { #0b680f7d: { #c1127ea9: 92 }, #c3687459: 94 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 17, #26f32be5: 91 },
-            { #0b680f7d: { #c1127ea9: 92 }, #c3687459: 16 })>,
+           ({ #d121c0bd: 17, #26f32be5: 92 },
+            { #0b680f7d: { #c1127ea9: 93 }, #c3687459: 16 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/virtual_bases.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/virtual_bases.cpp.exp
index d26001b80..810a00af7 100644
--- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/virtual_bases.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/virtual_bases.cpp.exp
@@ -81,7 +81,7 @@
                 { #c8ff724b: "A", #2cdb06fb: [ "A", "A" ] },
                 { #c1127ea9: 11 },
                 {
-                  #d2e9b40c: "14779025497907219583",
+                  #d2e9b40c: "16649858826465904026",
                   #f1a45f0e: true,
                   #ebe3c415: 10,
                   #c11b7aa2:
@@ -106,7 +106,7 @@
                 { #c8ff724b: "~A", #2cdb06fb: [ "~A", "A" ] },
                 { #c1127ea9: 14 },
                 {
-                  #d2e9b40c: "5328378654181921475",
+                  #d2e9b40c: "6691652126532499765",
                   #f1a45f0e: true,
                   #ebe3c415: 13,
                   #c11b7aa2:
@@ -130,7 +130,7 @@
                 { #c8ff724b: "A", #2cdb06fb: [ "A", "A" ] },
                 { #c1127ea9: 17 },
                 {
-                  #d2e9b40c: "3430056695640597274",
+                  #d2e9b40c: "6367731417382615745",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -225,7 +225,7 @@
                 { #c8ff724b: "B", #2cdb06fb: [ "B", "B" ] },
                 { #c1127ea9: 11 },
                 {
-                  #d2e9b40c: "10798876524598897542",
+                  #d2e9b40c: "8928078380412315851",
                   #f1a45f0e: true,
                   #ebe3c415: 26,
                   #c11b7aa2:
@@ -276,7 +276,7 @@
                 { #c8ff724b: "~B", #2cdb06fb: [ "~B", "B" ] },
                 { #c1127ea9: 14 },
                 {
-                  #d2e9b40c: "7876366742276079110",
+                  #d2e9b40c: "6627935060446176348",
                   #f1a45f0e: true,
                   #ebe3c415: 29,
                   #c11b7aa2:
@@ -300,7 +300,7 @@
                 { #c8ff724b: "B", #2cdb06fb: [ "B", "B" ] },
                 { #c1127ea9: 32 },
                 {
-                  #d2e9b40c: "7710293714478488613",
+                  #d2e9b40c: "6925252787601137710",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -397,7 +397,7 @@
                 { #c8ff724b: "C", #2cdb06fb: [ "C", "C" ] },
                 { #c1127ea9: 11 },
                 {
-                  #d2e9b40c: "5740611327153041165",
+                  #d2e9b40c: "5244587546945854124",
                   #f1a45f0e: true,
                   #ebe3c415: 41,
                   #c11b7aa2:
@@ -422,7 +422,7 @@
                 { #c8ff724b: "~C", #2cdb06fb: [ "~C", "C" ] },
                 { #c1127ea9: 14 },
                 {
-                  #d2e9b40c: "8663121109475859597",
+                  #d2e9b40c: "7422570726995459483",
                   #f1a45f0e: true,
                   #ebe3c415: 43,
                   #c11b7aa2:
@@ -446,7 +446,7 @@
                 { #c8ff724b: "C", #2cdb06fb: [ "C", "C" ] },
                 { #c1127ea9: 46 },
                 {
-                  #d2e9b40c: "13331393607183256536",
+                  #d2e9b40c: "7407813062435547771",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -538,7 +538,7 @@
                 { #c8ff724b: "E", #2cdb06fb: [ "E", "E" ] },
                 { #c1127ea9: 11 },
                 {
-                  #d2e9b40c: "7886195349376518403",
+                  #d2e9b40c: "9756747202958380830",
                   #f1a45f0e: true,
                   #ebe3c415: 55,
                   #c11b7aa2:
@@ -633,7 +633,7 @@
                 { #c8ff724b: "~E", #2cdb06fb: [ "~E", "E" ] },
                 { #c1127ea9: 14 },
                 {
-                  #d2e9b40c: "2987579715549688623",
+                  #d2e9b40c: "4366070428831679553",
                   #f1a45f0e: true,
                   #ebe3c415: 60,
                   #c11b7aa2:
@@ -657,7 +657,7 @@
                 { #c8ff724b: "E", #2cdb06fb: [ "E", "E" ] },
                 { #c1127ea9: 63 },
                 {
-                  #d2e9b40c: "13411848558695892246",
+                  #d2e9b40c: "1943152130981189005",
                   #f1a45f0e: true,
                   #3e64314e: true,
                   #d17ebeaa: [
@@ -796,30 +796,31 @@
         <#d3d219f7: ({ #d121c0bd: 133 }, { #c1127ea9: 71 })>,
         <#22d546dd: ({ #d121c0bd: 134 }, <#ea323187>)>,
         <#22d546dd: ({ #d121c0bd: 135 }, <#2fe155d3>)>,
-        <#d80cb60b: ({ #d121c0bd: 136 }, 137)>,
-        <#d3d219f7: ({ #d121c0bd: 138 }, { #c1127ea9: 76, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 139 }, { #c1127ea9: 73, #ea1a680e: true })>,
-        <#d3d219f7: ({ #d121c0bd: 140 }, { #c1127ea9: 73 })>,
-        <#d80cb60b: ({ #d121c0bd: 141 }, 142)>,
+        <#22d546dd: ({ #d121c0bd: 136 }, <#f65b235f>)>,
+        <#d80cb60b: ({ #d121c0bd: 137 }, 138)>,
+        <#d3d219f7: ({ #d121c0bd: 139 }, { #c1127ea9: 76, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 140 }, { #c1127ea9: 73, #ea1a680e: true })>,
+        <#d3d219f7: ({ #d121c0bd: 141 }, { #c1127ea9: 73 })>,
+        <#d80cb60b: ({ #d121c0bd: 142 }, 143)>,
         <#da0c5ecf:
-           ({ #d121c0bd: 143 },
-            { #cd26765d: { #c1127ea9: 141 }, #11302019: 24 },
+           ({ #d121c0bd: 144 },
+            { #cd26765d: { #c1127ea9: 142 }, #11302019: 24 },
             1)>,
         <#d80cb60b: ({ #d121c0bd: 8 }, 7)>,
-        <#d3d219f7: ({ #d121c0bd: 144 }, { #c1127ea9: 8 })>,
+        <#d3d219f7: ({ #d121c0bd: 145 }, { #c1127ea9: 8 })>,
         <#26796f6a:
            ({ #d121c0bd: 11 }, { #f9c96be9: { #c1127ea9: 71 } }, { })>,
         <#26796f6a:
-           ({ #d121c0bd: 145 }, { #f9c96be9: { #c1127ea9: 71 } }, { })>,
+           ({ #d121c0bd: 146 }, { #f9c96be9: { #c1127ea9: 71 } }, { })>,
         <#26796f6a:
            ({ #d121c0bd: 14 }, { #f9c96be9: { #c1127ea9: 71 } }, { })>,
         <#d80cb60b: ({ #d121c0bd: 24 }, 23)>,
-        <#d3d219f7: ({ #d121c0bd: 146 }, { #c1127ea9: 24 })>,
+        <#d3d219f7: ({ #d121c0bd: 147 }, { #c1127ea9: 24 })>,
         <#26796f6a:
-           ({ #d121c0bd: 147 }, { #f9c96be9: { #c1127ea9: 71 } }, { })>,
+           ({ #d121c0bd: 148 }, { #f9c96be9: { #c1127ea9: 71 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 34 }, { #c1127ea9: 24, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 148 },
+           ({ #d121c0bd: 149 },
             { #f9c96be9: { #c1127ea9: 71 } },
             { #08ec7593: [ { #c1127ea9: 34 } ] })>,
         <#26796f6a:
@@ -828,42 +829,42 @@
             { #08ec7593: [ { #c1127ea9: 34 } ] })>,
         <#0b08cd60: ({ #d121c0bd: 19 }, { #c1127ea9: 8, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 149 },
+           ({ #d121c0bd: 150 },
             { #f9c96be9: { #c1127ea9: 71 } },
             { #08ec7593: [ { #c1127ea9: 19 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 17 },
             { #f9c96be9: { #c1127ea9: 71 } },
             { #08ec7593: [ { #c1127ea9: 19 } ] })>,
-        <#0b08cd60: ({ #d121c0bd: 150 }, { #c1127ea9: 24 })>,
+        <#0b08cd60: ({ #d121c0bd: 151 }, { #c1127ea9: 24 })>,
         <#26796f6a:
-           ({ #d121c0bd: 151 },
-            { #f9c96be9: { #c1127ea9: 150 } },
+           ({ #d121c0bd: 152 },
+            { #f9c96be9: { #c1127ea9: 151 } },
             { #08ec7593: [ { #c1127ea9: 34 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 36 },
-            { #f9c96be9: { #c1127ea9: 150 } },
+            { #f9c96be9: { #c1127ea9: 151 } },
             { #08ec7593: [ { #c1127ea9: 34 } ] })>,
-        <#0b08cd60: ({ #d121c0bd: 152 }, { #c1127ea9: 8 })>,
+        <#0b08cd60: ({ #d121c0bd: 153 }, { #c1127ea9: 8 })>,
         <#26796f6a:
-           ({ #d121c0bd: 153 },
-            { #f9c96be9: { #c1127ea9: 152 } },
+           ({ #d121c0bd: 154 },
+            { #f9c96be9: { #c1127ea9: 153 } },
             { #08ec7593: [ { #c1127ea9: 19 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 21 },
-            { #f9c96be9: { #c1127ea9: 152 } },
+            { #f9c96be9: { #c1127ea9: 153 } },
             { #08ec7593: [ { #c1127ea9: 19 } ] })>,
         <#d80cb60b: ({ #d121c0bd: 39 }, 38)>,
-        <#d3d219f7: ({ #d121c0bd: 154 }, { #c1127ea9: 39 })>,
+        <#d3d219f7: ({ #d121c0bd: 155 }, { #c1127ea9: 39 })>,
         <#26796f6a:
-           ({ #d121c0bd: 155 }, { #f9c96be9: { #c1127ea9: 71 } }, { })>,
+           ({ #d121c0bd: 156 }, { #f9c96be9: { #c1127ea9: 71 } }, { })>,
         <#d80cb60b: ({ #d121c0bd: 53 }, 52)>,
-        <#d3d219f7: ({ #d121c0bd: 156 }, { #c1127ea9: 53 })>,
+        <#d3d219f7: ({ #d121c0bd: 157 }, { #c1127ea9: 53 })>,
         <#26796f6a:
-           ({ #d121c0bd: 157 }, { #f9c96be9: { #c1127ea9: 71 } }, { })>,
+           ({ #d121c0bd: 158 }, { #f9c96be9: { #c1127ea9: 71 } }, { })>,
         <#0b08cd60: ({ #d121c0bd: 65 }, { #c1127ea9: 53, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 158 },
+           ({ #d121c0bd: 159 },
             { #f9c96be9: { #c1127ea9: 71 } },
             { #08ec7593: [ { #c1127ea9: 65 } ] })>,
         <#26796f6a:
@@ -872,39 +873,39 @@
             { #08ec7593: [ { #c1127ea9: 65 } ] })>,
         <#0b08cd60: ({ #d121c0bd: 48 }, { #c1127ea9: 39, #ea1a680e: true })>,
         <#26796f6a:
-           ({ #d121c0bd: 159 },
+           ({ #d121c0bd: 160 },
             { #f9c96be9: { #c1127ea9: 71 } },
             { #08ec7593: [ { #c1127ea9: 48 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 46 },
             { #f9c96be9: { #c1127ea9: 71 } },
             { #08ec7593: [ { #c1127ea9: 48 } ] })>,
-        <#0b08cd60: ({ #d121c0bd: 160 }, { #c1127ea9: 53 })>,
+        <#0b08cd60: ({ #d121c0bd: 161 }, { #c1127ea9: 53 })>,
         <#26796f6a:
-           ({ #d121c0bd: 161 },
-            { #f9c96be9: { #c1127ea9: 160 } },
+           ({ #d121c0bd: 162 },
+            { #f9c96be9: { #c1127ea9: 161 } },
             { #08ec7593: [ { #c1127ea9: 65 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 67 },
-            { #f9c96be9: { #c1127ea9: 160 } },
+            { #f9c96be9: { #c1127ea9: 161 } },
             { #08ec7593: [ { #c1127ea9: 65 } ] })>,
-        <#0b08cd60: ({ #d121c0bd: 162 }, { #c1127ea9: 39 })>,
+        <#0b08cd60: ({ #d121c0bd: 163 }, { #c1127ea9: 39 })>,
         <#26796f6a:
-           ({ #d121c0bd: 163 },
-            { #f9c96be9: { #c1127ea9: 162 } },
+           ({ #d121c0bd: 164 },
+            { #f9c96be9: { #c1127ea9: 163 } },
             { #08ec7593: [ { #c1127ea9: 48 } ] })>,
         <#26796f6a:
            ({ #d121c0bd: 50 },
-            { #f9c96be9: { #c1127ea9: 162 } },
+            { #f9c96be9: { #c1127ea9: 163 } },
             { #08ec7593: [ { #c1127ea9: 48 } ] })>,
-        <#0098a8c5: ({ #d121c0bd: 164 }, { #fcd148e8: 130 })>,
-        <#2e3d736c: ({ #d121c0bd: 165 }, { #c1127ea9: 164 })>,
+        <#0098a8c5: ({ #d121c0bd: 165 }, { #fcd148e8: 130 })>,
+        <#2e3d736c: ({ #d121c0bd: 166 }, { #c1127ea9: 165 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 166, #26f32be5: 165 },
-            { #0b680f7d: { #c1127ea9: 165 }, #c3687459: 167 })>,
+           ({ #d121c0bd: 167, #26f32be5: 166 },
+            { #0b680f7d: { #c1127ea9: 166 }, #c3687459: 168 })>,
         <#19e1ef85:
-           ({ #d121c0bd: 70, #26f32be5: 165 },
-            { #0b680f7d: { #c1127ea9: 166 }, #c3687459: 69 })>,
+           ({ #d121c0bd: 70, #26f32be5: 166 },
+            { #0b680f7d: { #c1127ea9: 167 }, #c3687459: 69 })>,
         <#cfc9a9b2: ({ #d121c0bd: 0 })>
       ]
     })>
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/Hello.m.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/Hello.m.exp
index 75c578666..09fbbdc19 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/Hello.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/Hello.m.exp
@@ -1826,9 +1826,20 @@
         "is_implicit" : true,
         "is_used" : true,
         "attributes" : [
-          ["FormatAttr" , [
+          ["BuiltinAttr" , [
             {
               "pointer" : 89,
+              "source_range" : [
+                {
+                },
+                {
+                }
+              ]
+            }
+          ]],
+          ["FormatAttr" , [
+            {
+              "pointer" : 90,
               "source_range" : [
                 {
                   "column" : 13
@@ -1848,14 +1859,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 91,
+              "pointer" : 92,
               "source_range" : [
                 {
                 },
@@ -1881,7 +1892,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 92,
+        "pointer" : 93,
         "source_range" : [
           {
             "column" : 1
@@ -1893,9 +1904,20 @@
         "is_used" : true,
         "is_this_declaration_referenced" : true,
         "attributes" : [
+          ["BuiltinAttr" , [
+            {
+              "pointer" : 94,
+              "source_range" : [
+                {
+                },
+                {
+                }
+              ]
+            }
+          ]],
           ["FormatAttr" , [
             {
-              "pointer" : 93,
+              "pointer" : 95,
               "source_range" : [
                 {
                   "column" : 13
@@ -1915,14 +1937,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 94,
+              "pointer" : 96,
               "source_range" : [
                 {
                   "column" : 19
@@ -1950,7 +1972,7 @@
     ]],
     ["ObjCInterfaceDecl" , [
       {
-        "pointer" : 95,
+        "pointer" : 97,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -1973,8 +1995,8 @@
       [
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 96,
-            "parent_pointer" : 95,
+            "pointer" : 98,
+            "parent_pointer" : 97,
             "source_range" : [
               {
                 "line" : 11,
@@ -1995,12 +2017,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 97
+              "type_ptr" : 99
             },
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 98,
+                  "pointer" : 100,
                   "source_range" : [
                     {
                       "column" : 14
@@ -2027,7 +2049,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 99,
+                  "pointer" : 101,
                   "source_range" : [
                     {
                     },
@@ -2043,7 +2065,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 100,
+                  "type_ptr" : 102,
                   "is_const" : true
                 },
                 {
@@ -2051,7 +2073,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 101,
+                  "pointer" : 103,
                   "source_range" : [
                     {
                     },
@@ -2092,7 +2114,7 @@
         },
         "implementation" : {
           "kind" : "ObjCImplementation",
-          "decl_pointer" : 102,
+          "decl_pointer" : 104,
           "name" : {
             "name" : "Hello",
             "qual_name" : [
@@ -2104,7 +2126,7 @@
     ]],
     ["ObjCImplementationDecl" , [
       {
-        "pointer" : 102,
+        "pointer" : 104,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -2126,8 +2148,8 @@
       [
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 103,
-            "parent_pointer" : 102,
+            "pointer" : 105,
+            "parent_pointer" : 104,
             "source_range" : [
               {
                 "line" : 15,
@@ -2149,12 +2171,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 97
+              "type_ptr" : 99
             },
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 104,
+                  "pointer" : 106,
                   "source_range" : [
                     {
                       "line" : 15,
@@ -2184,7 +2206,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 105,
+                  "pointer" : 107,
                   "source_range" : [
                     {
                     },
@@ -2200,7 +2222,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 100,
+                  "type_ptr" : 102,
                   "is_const" : true
                 },
                 {
@@ -2208,7 +2230,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 106,
+                  "pointer" : 108,
                   "source_range" : [
                     {
                     },
@@ -2232,7 +2254,7 @@
             ],
             "body" : ["CompoundStmt" , [
               {
-                "pointer" : 107,
+                "pointer" : 109,
                 "source_range" : [
                   {
                     "column" : 20
@@ -2246,7 +2268,7 @@
               [
                 ["IfStmt" , [
                   {
-                    "pointer" : 108,
+                    "pointer" : 110,
                     "source_range" : [
                       {
                         "line" : 16,
@@ -2261,7 +2283,7 @@
                   [
                     ["BinaryOperator" , [
                       {
-                        "pointer" : 109,
+                        "pointer" : 111,
                         "source_range" : [
                           {
                             "line" : 16,
@@ -2275,7 +2297,7 @@
                       [
                         ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 110,
+                            "pointer" : 112,
                             "source_range" : [
                               {
                                 "column" : 7
@@ -2288,7 +2310,7 @@
                           [
                             ["DeclRefExpr" , [
                               {
-                                "pointer" : 111,
+                                "pointer" : 113,
                                 "source_range" : [
                                   {
                                     "column" : 7
@@ -2309,7 +2331,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : "ParmVar",
-                                  "decl_pointer" : 104,
+                                  "decl_pointer" : 106,
                                   "name" : {
                                     "name" : "i",
                                     "qual_name" : [
@@ -2336,7 +2358,7 @@
                         ]],
                         ["IntegerLiteral" , [
                           {
-                            "pointer" : 112,
+                            "pointer" : 114,
                             "source_range" : [
                               {
                                 "column" : 11
@@ -2371,7 +2393,7 @@
                     ]],
                     ["CompoundStmt" , [
                       {
-                        "pointer" : 113,
+                        "pointer" : 115,
                         "source_range" : [
                           {
                             "column" : 14
@@ -2385,7 +2407,7 @@
                       [
                         ["CallExpr" , [
                           {
-                            "pointer" : 114,
+                            "pointer" : 116,
                             "source_range" : [
                               {
                                 "line" : 17,
@@ -2399,7 +2421,7 @@
                           [
                             ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 115,
+                                "pointer" : 117,
                                 "source_range" : [
                                   {
                                     "column" : 5
@@ -2412,7 +2434,7 @@
                               [
                                 ["DeclRefExpr" , [
                                   {
-                                    "pointer" : 116,
+                                    "pointer" : 118,
                                     "source_range" : [
                                       {
                                         "column" : 5
@@ -2426,13 +2448,13 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 90
+                                      "type_ptr" : 91
                                     }
                                   },
                                   {
                                     "decl_ref" : {
                                       "kind" : "Function",
-                                      "decl_pointer" : 92,
+                                      "decl_pointer" : 93,
                                       "name" : {
                                         "name" : "NSLog",
                                         "qual_name" : [
@@ -2440,7 +2462,7 @@
                                         ]
                                       },
                                       "qual_type" : {
-                                        "type_ptr" : 90
+                                        "type_ptr" : 91
                                       }
                                     }
                                   }
@@ -2448,7 +2470,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 117
+                                  "type_ptr" : 119
                                 }
                               },
                               {
@@ -2459,7 +2481,7 @@
                             ]],
                             ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 118,
+                                "pointer" : 120,
                                 "source_range" : [
                                   {
                                     "column" : 11
@@ -2472,7 +2494,7 @@
                               [
                                 ["ObjCStringLiteral" , [
                                   {
-                                    "pointer" : 119,
+                                    "pointer" : 121,
                                     "source_range" : [
                                       {
                                         "column" : 11
@@ -2485,7 +2507,7 @@
                                   [
                                     ["StringLiteral" , [
                                       {
-                                        "pointer" : 120,
+                                        "pointer" : 122,
                                         "source_range" : [
                                           {
                                             "column" : 12
@@ -2499,7 +2521,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 121
+                                          "type_ptr" : 123
                                         },
                                         "value_kind" : "LValue"
                                       },
@@ -2528,7 +2550,7 @@
                             ]],
                             ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 122,
+                                "pointer" : 124,
                                 "source_range" : [
                                   {
                                     "column" : 34
@@ -2541,7 +2563,7 @@
                               [
                                 ["DeclRefExpr" , [
                                   {
-                                    "pointer" : 123,
+                                    "pointer" : 125,
                                     "source_range" : [
                                       {
                                         "column" : 34
@@ -2562,7 +2584,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : "ParmVar",
-                                      "decl_pointer" : 104,
+                                      "decl_pointer" : 106,
                                       "name" : {
                                         "name" : "i",
                                         "qual_name" : [
@@ -2590,7 +2612,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 97
+                              "type_ptr" : 99
                             }
                           }
                         ]]
@@ -2598,8 +2620,8 @@
                     ]]
                   ],
                   {
-                    "cond" : 109,
-                    "then" : 113
+                    "cond" : 111,
+                    "then" : 115
                   }
                 ]]
               ]
@@ -2613,7 +2635,7 @@
       {
         "class_interface" : {
           "kind" : "ObjCInterface",
-          "decl_pointer" : 95,
+          "decl_pointer" : 97,
           "name" : {
             "name" : "Hello",
             "qual_name" : [
@@ -2625,7 +2647,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 124,
+        "pointer" : 126,
         "source_range" : [
           {
             "line" : 22,
@@ -2644,13 +2666,13 @@
         ]
       },
       {
-        "type_ptr" : 125
+        "type_ptr" : 127
       },
       {
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 126,
+              "pointer" : 128,
               "source_range" : [
                 {
                   "line" : 22,
@@ -2676,7 +2698,7 @@
           ]],
           ["ParmVarDecl" , [
             {
-              "pointer" : 127,
+              "pointer" : 129,
               "source_range" : [
                 {
                   "column" : 20
@@ -2693,17 +2715,17 @@
               ]
             },
             {
-              "type_ptr" : 128
+              "type_ptr" : 130
             },
             {
               "parm_index_in_function" : 1
             }
           ]]
         ],
-        "decl_ptr_with_body" : 124,
+        "decl_ptr_with_body" : 126,
         "body" : ["CompoundStmt" , [
           {
-            "pointer" : 129,
+            "pointer" : 131,
             "source_range" : [
               {
                 "column" : 34
@@ -2717,7 +2739,7 @@
           [
             ["ForStmt" , [
               {
-                "pointer" : 130,
+                "pointer" : 132,
                 "source_range" : [
                   {
                     "line" : 23,
@@ -2732,7 +2754,7 @@
               [
                 ["DeclStmt" , [
                   {
-                    "pointer" : 131,
+                    "pointer" : 133,
                     "source_range" : [
                       {
                         "line" : 23,
@@ -2746,7 +2768,7 @@
                   [
                     ["IntegerLiteral" , [
                       {
-                        "pointer" : 132,
+                        "pointer" : 134,
                         "source_range" : [
                           {
                             "column" : 16
@@ -2773,7 +2795,7 @@
                   [
                     ["VarDecl" , [
                       {
-                        "pointer" : 133,
+                        "pointer" : 135,
                         "source_range" : [
                           {
                             "column" : 8
@@ -2797,7 +2819,7 @@
                       {
                         "init_expr" : ["IntegerLiteral" , [
                           {
-                            "pointer" : 132,
+                            "pointer" : 134,
                             "source_range" : [
                               {
                                 "column" : 16
@@ -2826,7 +2848,7 @@
                 ]],
                 ["NullStmt" , [
                   {
-                    "pointer" : 134,
+                    "pointer" : 136,
                     "source_range" : [
                       {
                       },
@@ -2839,7 +2861,7 @@
                 ]],
                 ["BinaryOperator" , [
                   {
-                    "pointer" : 135,
+                    "pointer" : 137,
                     "source_range" : [
                       {
                         "column" : 19
@@ -2852,7 +2874,7 @@
                   [
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 136,
+                        "pointer" : 138,
                         "source_range" : [
                           {
                             "column" : 19
@@ -2865,7 +2887,7 @@
                       [
                         ["DeclRefExpr" , [
                           {
-                            "pointer" : 137,
+                            "pointer" : 139,
                             "source_range" : [
                               {
                                 "column" : 19
@@ -2886,7 +2908,7 @@
                           {
                             "decl_ref" : {
                               "kind" : "Var",
-                              "decl_pointer" : 133,
+                              "decl_pointer" : 135,
                               "name" : {
                                 "name" : "i",
                                 "qual_name" : [
@@ -2913,7 +2935,7 @@
                     ]],
                     ["IntegerLiteral" , [
                       {
-                        "pointer" : 138,
+                        "pointer" : 140,
                         "source_range" : [
                           {
                             "column" : 23
@@ -2948,7 +2970,7 @@
                 ]],
                 ["UnaryOperator" , [
                   {
-                    "pointer" : 139,
+                    "pointer" : 141,
                     "source_range" : [
                       {
                         "column" : 26
@@ -2961,7 +2983,7 @@
                   [
                     ["DeclRefExpr" , [
                       {
-                        "pointer" : 140,
+                        "pointer" : 142,
                         "source_range" : [
                           {
                             "column" : 26
@@ -2982,7 +3004,7 @@
                       {
                         "decl_ref" : {
                           "kind" : "Var",
-                          "decl_pointer" : 133,
+                          "decl_pointer" : 135,
                           "name" : {
                             "name" : "i",
                             "qual_name" : [
@@ -3008,7 +3030,7 @@
                 ]],
                 ["CompoundStmt" , [
                   {
-                    "pointer" : 141,
+                    "pointer" : 143,
                     "source_range" : [
                       {
                         "column" : 31
@@ -3022,7 +3044,7 @@
                   [
                     ["ObjCAutoreleasePoolStmt" , [
                       {
-                        "pointer" : 142,
+                        "pointer" : 144,
                         "source_range" : [
                           {
                             "line" : 24,
@@ -3037,7 +3059,7 @@
                       [
                         ["CompoundStmt" , [
                           {
-                            "pointer" : 143,
+                            "pointer" : 145,
                             "source_range" : [
                               {
                                 "line" : 24,
@@ -3052,7 +3074,7 @@
                           [
                             ["ExprWithCleanups" , [
                               {
-                                "pointer" : 144,
+                                "pointer" : 146,
                                 "source_range" : [
                                   {
                                     "line" : 25,
@@ -3066,7 +3088,7 @@
                               [
                                 ["ObjCMessageExpr" , [
                                   {
-                                    "pointer" : 145,
+                                    "pointer" : 147,
                                     "source_range" : [
                                       {
                                         "column" : 7
@@ -3079,7 +3101,7 @@
                                   [
                                     ["ImplicitCastExpr" , [
                                       {
-                                        "pointer" : 146,
+                                        "pointer" : 148,
                                         "source_range" : [
                                           {
                                             "column" : 8
@@ -3092,7 +3114,7 @@
                                       [
                                         ["ObjCMessageExpr" , [
                                           {
-                                            "pointer" : 147,
+                                            "pointer" : 149,
                                             "source_range" : [
                                               {
                                                 "column" : 8
@@ -3106,21 +3128,21 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 100
+                                              "type_ptr" : 102
                                             }
                                           },
                                           {
                                             "selector" : "new",
                                             "decl_pointer" : 24,
                                             "receiver_kind" : ["Class" , {
-                                              "type_ptr" : 148
+                                              "type_ptr" : 150
                                             }]
                                           }
                                         ]]
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 100
+                                          "type_ptr" : 102
                                         }
                                       },
                                       {
@@ -3131,7 +3153,7 @@
                                     ]],
                                     ["ImplicitCastExpr" , [
                                       {
-                                        "pointer" : 149,
+                                        "pointer" : 151,
                                         "source_range" : [
                                           {
                                             "column" : 24
@@ -3144,7 +3166,7 @@
                                       [
                                         ["DeclRefExpr" , [
                                           {
-                                            "pointer" : 150,
+                                            "pointer" : 152,
                                             "source_range" : [
                                               {
                                                 "column" : 24
@@ -3165,7 +3187,7 @@
                                           {
                                             "decl_ref" : {
                                               "kind" : "Var",
-                                              "decl_pointer" : 133,
+                                              "decl_pointer" : 135,
                                               "name" : {
                                                 "name" : "i",
                                                 "qual_name" : [
@@ -3193,19 +3215,19 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 97
+                                      "type_ptr" : 99
                                     }
                                   },
                                   {
                                     "selector" : "say:",
                                     "is_definition_found" : true,
-                                    "decl_pointer" : 103
+                                    "decl_pointer" : 105
                                   }
                                 ]]
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 97
+                                  "type_ptr" : 99
                                 }
                               },
                               {
@@ -3221,7 +3243,7 @@
             ]],
             ["ReturnStmt" , [
               {
-                "pointer" : 151,
+                "pointer" : 153,
                 "source_range" : [
                   {
                     "line" : 28,
@@ -3235,7 +3257,7 @@
               [
                 ["IntegerLiteral" , [
                   {
-                    "pointer" : 152,
+                    "pointer" : 154,
                     "source_range" : [
                       {
                         "column" : 10
@@ -3266,7 +3288,7 @@
     ]],
     ["TypedefDecl" , [
       {
-        "pointer" : 153,
+        "pointer" : 155,
         "source_range" : [
           {
           },
@@ -3302,31 +3324,31 @@
     "types" : [
       ["BuiltinType" , [
         {
-          "pointer" : 97
+          "pointer" : 99
         },
         "Void"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 154
+          "pointer" : 156
         },
         "Bool"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 155
+          "pointer" : 157
         },
         "Char_S"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 156
+          "pointer" : 158
         },
         "SChar"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 157
+          "pointer" : 159
         },
         "Short"
       ]],
@@ -3338,25 +3360,25 @@
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 158
+          "pointer" : 160
         },
         "Long"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 159
+          "pointer" : 161
         },
         "LongLong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 160
+          "pointer" : 162
         },
         "UChar"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 161
+          "pointer" : 163
         },
         "UShort"
       ]],
@@ -3368,369 +3390,375 @@
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 162
+          "pointer" : 164
         },
         "ULong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 163
+          "pointer" : 165
         },
         "ULongLong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 164
+          "pointer" : 166
         },
         "Float"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 165
+          "pointer" : 167
         },
         "Double"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 166
+          "pointer" : 168
         },
         "LongDouble"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 167
+          "pointer" : 169
         },
         "Float128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 168
+          "pointer" : 170
         },
         "Float16"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 169
+          "pointer" : 171
         },
         "ShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 170
+          "pointer" : 172
         },
         "Accum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 171
+          "pointer" : 173
         },
         "LongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 172
+          "pointer" : 174
         },
         "UShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 173
+          "pointer" : 175
         },
         "UAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 174
+          "pointer" : 176
         },
         "ULongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 175
+          "pointer" : 177
         },
         "ShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 176
+          "pointer" : 178
         },
         "Fract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 177
+          "pointer" : 179
         },
         "LongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 178
+          "pointer" : 180
         },
         "UShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 179
+          "pointer" : 181
         },
         "UFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 180
+          "pointer" : 182
         },
         "ULongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 181
+          "pointer" : 183
         },
         "SatShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 182
+          "pointer" : 184
         },
         "SatAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 183
+          "pointer" : 185
         },
         "SatLongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 184
+          "pointer" : 186
         },
         "SatUShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 185
+          "pointer" : 187
         },
         "SatUAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 186
+          "pointer" : 188
         },
         "SatULongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 187
+          "pointer" : 189
         },
         "SatShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 188
+          "pointer" : 190
         },
         "SatFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 189
+          "pointer" : 191
         },
         "SatLongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 190
+          "pointer" : 192
         },
         "SatUShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 191
+          "pointer" : 193
         },
         "SatUFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 192
+          "pointer" : 194
         },
         "SatULongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 193
+          "pointer" : 195
         },
         "Int128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 194
+          "pointer" : 196
         },
         "UInt128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 195
+          "pointer" : 197
         },
         "WChar_S"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 196
+          "pointer" : 198
         },
         "Char8"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 197
+          "pointer" : 199
         },
         "Dependent"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 198
+          "pointer" : 200
         },
         "Overload"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 199
+          "pointer" : 201
         },
         "BoundMember"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 200
+          "pointer" : 202
         },
         "PseudoObject"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 201
+          "pointer" : 203
         },
         "UnknownAny"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 202
+          "pointer" : 204
         },
         "ARCUnbridgedCast"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 203
+          "pointer" : 205
         },
         "BuiltinFn"
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 204
+          "pointer" : 206
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 205
+          "pointer" : 207
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 206
+          "pointer" : 208
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 207
+          "pointer" : 209
         }
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 208
+          "pointer" : 210
         },
         "ObjCId"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 209
+          "pointer" : 211
         },
         "ObjCClass"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 210
+          "pointer" : 212
         },
         "ObjCSel"
       ]],
       ["PointerType" , [
         {
-          "pointer" : 211
+          "pointer" : 213
         },
         {
-          "type_ptr" : 97
+          "type_ptr" : 99
         }
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 212
+          "pointer" : 214
         },
         "NullPtr"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 213
+          "pointer" : 215
         },
         "Half"
       ]],
+      ["BuiltinType" , [
+        {
+          "pointer" : 216
+        },
+        "BFloat16"
+      ]],
       ["PointerType" , [
         {
-          "pointer" : 214
+          "pointer" : 217
         },
         {
-          "type_ptr" : 210
+          "type_ptr" : 212
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 215
+          "pointer" : 218
         },
         {
-          "base_type" : 208
+          "base_type" : 210
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 216
+          "pointer" : 219
         },
         {
-          "type_ptr" : 215
+          "type_ptr" : 218
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 217
+          "pointer" : 220
         },
         {
-          "base_type" : 209
+          "base_type" : 211
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 218
+          "pointer" : 221
         },
         {
-          "type_ptr" : 217
+          "type_ptr" : 220
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 219
+          "pointer" : 222
         },
         10
       ]],
       ["RecordType" , [
         {
-          "pointer" : 220
+          "pointer" : 223
         },
-        221
+        224
       ]],
       ["PointerType" , [
         {
-          "pointer" : 222
+          "pointer" : 225
         },
         {
           "type_ptr" : 53,
@@ -3739,34 +3767,34 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 223
+          "pointer" : 226
         },
         {
-          "type_ptr" : 155,
+          "type_ptr" : 157,
           "is_const" : true
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 224
+          "pointer" : 227
         },
         {
-          "type_ptr" : 155
+          "type_ptr" : 157
         }
       ]],
       ["RecordType" , [
         {
-          "pointer" : 225
+          "pointer" : 228
         },
-        226
+        229
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 227
+          "pointer" : 230
         },
         {
           "element_type" : {
-            "type_ptr" : 225
+            "type_ptr" : 228
           },
           "stride" : 24
         },
@@ -3774,18 +3802,18 @@
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 228
+          "pointer" : 231
         },
         18
       ]],
       ["TypedefType" , [
         {
           "pointer" : 7,
-          "desugared_type" : 216
+          "desugared_type" : 219
         },
         {
           "child_type" : {
-            "type_ptr" : 216
+            "type_ptr" : 219
           },
           "decl_ptr" : 6
         }
@@ -3793,23 +3821,23 @@
       ["TypedefType" , [
         {
           "pointer" : 21,
-          "desugared_type" : 216
+          "desugared_type" : 219
         },
         {
           "child_type" : {
             "type_ptr" : 7
           },
-          "decl_ptr" : 153
+          "decl_ptr" : 155
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 9,
-          "desugared_type" : 218
+          "desugared_type" : 221
         },
         {
           "child_type" : {
-            "type_ptr" : 218
+            "type_ptr" : 221
           },
           "decl_ptr" : 8
         }
@@ -3817,11 +3845,11 @@
       ["TypedefType" , [
         {
           "pointer" : 5,
-          "desugared_type" : 214
+          "desugared_type" : 217
         },
         {
           "child_type" : {
-            "type_ptr" : 214
+            "type_ptr" : 217
           },
           "decl_ptr" : 4
         }
@@ -3831,7 +3859,7 @@
           "pointer" : 30
         },
         {
-          "type_ptr" : 228
+          "type_ptr" : 231
         }
       ]],
       ["TypedefType" , [
@@ -3851,18 +3879,18 @@
           "pointer" : 47
         },
         {
-          "type_ptr" : 219
+          "type_ptr" : 222
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 229
+          "pointer" : 232
         },
         50
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 230
+          "pointer" : 233
         },
         56
       ]],
@@ -3883,29 +3911,29 @@
           "pointer" : 59
         },
         {
-          "type_ptr" : 230
+          "type_ptr" : 233
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 231
+          "pointer" : 234
         },
         61
       ]],
       ["IncompleteArrayType" , [
         {
-          "pointer" : 232
+          "pointer" : 235
         },
         {
           "element_type" : {
-            "type_ptr" : 216
+            "type_ptr" : 219
           },
           "stride" : 8
         }
       ]],
       ["IncompleteArrayType" , [
         {
-          "pointer" : 233
+          "pointer" : 236
         },
         {
           "element_type" : {
@@ -3917,7 +3945,7 @@
       ]],
       ["IncompleteArrayType" , [
         {
-          "pointer" : 234
+          "pointer" : 237
         },
         {
           "element_type" : {
@@ -3929,16 +3957,16 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 235
+          "pointer" : 238
         },
         {
-          "type_ptr" : 216,
+          "type_ptr" : 219,
           "is_const" : true
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 236
+          "pointer" : 239
         },
         {
           "type_ptr" : 7,
@@ -3948,10 +3976,10 @@
       ["DecayedType" , [
         {
           "pointer" : 64,
-          "desugared_type" : 236
+          "desugared_type" : 239
         },
         {
-          "type_ptr" : 236
+          "type_ptr" : 239
         }
       ]],
       ["ObjCObjectPointerType" , [
@@ -3959,21 +3987,21 @@
           "pointer" : 72
         },
         {
-          "type_ptr" : 231
+          "type_ptr" : 234
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 237
+          "pointer" : 240
         },
         74
       ]],
       ["PointerType" , [
         {
-          "pointer" : 238
+          "pointer" : 241
         },
         {
-          "type_ptr" : 216
+          "type_ptr" : 219
         }
       ]],
       ["PointerType" , [
@@ -3989,22 +4017,22 @@
           "pointer" : 85
         },
         {
-          "type_ptr" : 237
+          "type_ptr" : 240
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 239
+          "pointer" : 242
         },
         87
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 240
+          "pointer" : 243
         },
         {
           "return_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 99
           }
         },
         {
@@ -4017,11 +4045,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 241
+          "pointer" : 244
         },
         {
           "return_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 99
           }
         },
         {
@@ -4034,28 +4062,28 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 242
+          "pointer" : 245
         },
         {
           "return_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 99
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 216
+              "type_ptr" : 219
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "return_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 99
           }
         },
         {
@@ -4068,25 +4096,25 @@
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 148
+          "pointer" : 150
         },
-        95
+        97
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 100
+          "pointer" : 102
         },
         {
-          "type_ptr" : 148
+          "type_ptr" : 150
         }
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 121
+          "pointer" : 123
         },
         {
           "element_type" : {
-            "type_ptr" : 155
+            "type_ptr" : 157
           },
           "stride" : 1
         },
@@ -4094,51 +4122,51 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 243
+          "pointer" : 246
         },
         {
-          "type_ptr" : 242
+          "type_ptr" : 245
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 117
+          "pointer" : 119
         },
         {
-          "type_ptr" : 90
+          "type_ptr" : 91
         }
       ]],
       ["IncompleteArrayType" , [
         {
-          "pointer" : 244
+          "pointer" : 247
         },
         {
           "element_type" : {
-            "type_ptr" : 224
+            "type_ptr" : 227
           },
           "stride" : 8
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 245
+          "pointer" : 248
         },
         {
-          "type_ptr" : 224
+          "type_ptr" : 227
         }
       ]],
       ["DecayedType" , [
         {
-          "pointer" : 128,
-          "desugared_type" : 245
+          "pointer" : 130,
+          "desugared_type" : 248
         },
         {
-          "type_ptr" : 245
+          "type_ptr" : 248
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 246
+          "pointer" : 249
         },
         {
           "return_type" : {
@@ -4151,14 +4179,14 @@
               "type_ptr" : 53
             },
             {
-              "type_ptr" : 245
+              "type_ptr" : 248
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 125
+          "pointer" : 127
         },
         {
           "return_type" : {
@@ -4171,7 +4199,7 @@
               "type_ptr" : 53
             },
             {
-              "type_ptr" : 128
+              "type_ptr" : 130
             }
           ]
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCBridgeTransferTest.m.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCBridgeTransferTest.m.exp
index e052bf4a5..b5b289c05 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCBridgeTransferTest.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCBridgeTransferTest.m.exp
@@ -1825,9 +1825,20 @@
         ],
         "is_implicit" : true,
         "attributes" : [
-          ["FormatAttr" , [
+          ["BuiltinAttr" , [
             {
               "pointer" : 89,
+              "source_range" : [
+                {
+                },
+                {
+                }
+              ]
+            }
+          ]],
+          ["FormatAttr" , [
+            {
+              "pointer" : 90,
               "source_range" : [
                 {
                   "column" : 13
@@ -1847,14 +1858,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 91,
+              "pointer" : 92,
               "source_range" : [
                 {
                 },
@@ -1880,7 +1891,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 92,
+        "pointer" : 93,
         "source_range" : [
           {
             "column" : 1
@@ -1890,9 +1901,20 @@
           }
         ],
         "attributes" : [
+          ["BuiltinAttr" , [
+            {
+              "pointer" : 94,
+              "source_range" : [
+                {
+                },
+                {
+                }
+              ]
+            }
+          ]],
           ["FormatAttr" , [
             {
-              "pointer" : 93,
+              "pointer" : 95,
               "source_range" : [
                 {
                   "column" : 13
@@ -1912,14 +1934,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 94,
+              "pointer" : 96,
               "source_range" : [
                 {
                   "column" : 19
@@ -1947,7 +1969,7 @@
     ]],
     ["RecordDecl" , [
       {
-        "pointer" : 95,
+        "pointer" : 97,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -1967,20 +1989,20 @@
           "ABFDataRef"
         ]
       },
-      96,
+      98,
       [
       ],
       {
       },
       "TTK_Struct",
       {
-        "definition_ptr" : 95,
+        "definition_ptr" : 97,
         "is_complete_definition" : true
       }
     ]],
     ["TypedefDecl" , [
       {
-        "pointer" : 97,
+        "pointer" : 99,
         "source_range" : [
           {
             "line" : 10,
@@ -1999,13 +2021,13 @@
           "ABFDataRef"
         ]
       },
-      98,
+      100,
       {
       }
     ]],
     ["ObjCInterfaceDecl" , [
       {
-        "pointer" : 99,
+        "pointer" : 101,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -2033,7 +2055,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 100,
+        "pointer" : 102,
         "source_range" : [
           {
             "line" : 16,
@@ -2053,14 +2075,14 @@
         ]
       },
       {
-        "type_ptr" : 101
+        "type_ptr" : 103
       },
       {
       }
     ]],
     ["ObjCInterfaceDecl" , [
       {
-        "pointer" : 102,
+        "pointer" : 104,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -2096,7 +2118,7 @@
         },
         "implementation" : {
           "kind" : "ObjCImplementation",
-          "decl_pointer" : 103,
+          "decl_pointer" : 105,
           "name" : {
             "name" : "A",
             "qual_name" : [
@@ -2108,7 +2130,7 @@
     ]],
     ["ObjCImplementationDecl" , [
       {
-        "pointer" : 103,
+        "pointer" : 105,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -2130,8 +2152,8 @@
       [
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 104,
-            "parent_pointer" : 103,
+            "pointer" : 106,
+            "parent_pointer" : 105,
             "source_range" : [
               {
                 "line" : 23,
@@ -2153,12 +2175,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 105
+              "type_ptr" : 107
             },
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 106,
+                  "pointer" : 108,
                   "source_range" : [
                     {
                     },
@@ -2174,7 +2196,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 107,
+                  "type_ptr" : 109,
                   "is_const" : true
                 },
                 {
@@ -2182,7 +2204,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 108,
+                  "pointer" : 110,
                   "source_range" : [
                     {
                     },
@@ -2206,7 +2228,7 @@
             ],
             "body" : ["CompoundStmt" , [
               {
-                "pointer" : 109,
+                "pointer" : 111,
                 "source_range" : [
                   {
                     "line" : 23,
@@ -2221,7 +2243,7 @@
               [
                 ["DeclStmt" , [
                   {
-                    "pointer" : 110,
+                    "pointer" : 112,
                     "source_range" : [
                       {
                         "line" : 24,
@@ -2235,7 +2257,7 @@
                   [
                     ["ExprWithCleanups" , [
                       {
-                        "pointer" : 111,
+                        "pointer" : 113,
                         "source_range" : [
                           {
                             "column" : 23
@@ -2248,7 +2270,7 @@
                       [
                         ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 112,
+                            "pointer" : 114,
                             "source_range" : [
                               {
                                 "column" : 23
@@ -2261,7 +2283,7 @@
                           [
                             ["ObjCBridgedCastExpr" , [
                               {
-                                "pointer" : 113,
+                                "pointer" : 115,
                                 "source_range" : [
                                   {
                                     "column" : 23
@@ -2274,7 +2296,7 @@
                               [
                                 ["CallExpr" , [
                                   {
-                                    "pointer" : 114,
+                                    "pointer" : 116,
                                     "source_range" : [
                                       {
                                         "column" : 51
@@ -2287,7 +2309,7 @@
                                   [
                                     ["ImplicitCastExpr" , [
                                       {
-                                        "pointer" : 115,
+                                        "pointer" : 117,
                                         "source_range" : [
                                           {
                                             "column" : 51
@@ -2300,7 +2322,7 @@
                                       [
                                         ["DeclRefExpr" , [
                                           {
-                                            "pointer" : 116,
+                                            "pointer" : 118,
                                             "source_range" : [
                                               {
                                                 "column" : 51
@@ -2314,13 +2336,13 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 101
+                                              "type_ptr" : 103
                                             }
                                           },
                                           {
                                             "decl_ref" : {
                                               "kind" : "Function",
-                                              "decl_pointer" : 100,
+                                              "decl_pointer" : 102,
                                               "name" : {
                                                 "name" : "ABFDataCreate",
                                                 "qual_name" : [
@@ -2328,7 +2350,7 @@
                                                 ]
                                               },
                                               "qual_type" : {
-                                                "type_ptr" : 101
+                                                "type_ptr" : 103
                                               }
                                             }
                                           }
@@ -2336,7 +2358,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 117
+                                          "type_ptr" : 119
                                         }
                                       },
                                       {
@@ -2348,14 +2370,14 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 118
+                                      "type_ptr" : 120
                                     }
                                   }
                                 ]]
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 119
+                                  "type_ptr" : 121
                                 }
                               },
                               {
@@ -2364,7 +2386,7 @@
                                 ]
                               },
                               {
-                                "type_ptr" : 119
+                                "type_ptr" : 121
                               },
                               {
                                 "cast_kind" : "OBC_BridgeTransfer"
@@ -2373,7 +2395,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 119
+                              "type_ptr" : 121
                             }
                           },
                           {
@@ -2385,7 +2407,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 119
+                          "type_ptr" : 121
                         }
                       },
                       {
@@ -2395,7 +2417,7 @@
                   [
                     ["VarDecl" , [
                       {
-                        "pointer" : 120,
+                        "pointer" : 122,
                         "source_range" : [
                           {
                             "column" : 3
@@ -2412,12 +2434,12 @@
                         ]
                       },
                       {
-                        "type_ptr" : 119
+                        "type_ptr" : 121
                       },
                       {
                         "init_expr" : ["ExprWithCleanups" , [
                           {
-                            "pointer" : 111,
+                            "pointer" : 113,
                             "source_range" : [
                               {
                                 "column" : 23
@@ -2430,7 +2452,7 @@
                           [
                             ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 112,
+                                "pointer" : 114,
                                 "source_range" : [
                                   {
                                     "column" : 23
@@ -2443,7 +2465,7 @@
                               [
                                 ["ObjCBridgedCastExpr" , [
                                   {
-                                    "pointer" : 113,
+                                    "pointer" : 115,
                                     "source_range" : [
                                       {
                                         "column" : 23
@@ -2456,7 +2478,7 @@
                                   [
                                     ["CallExpr" , [
                                       {
-                                        "pointer" : 114,
+                                        "pointer" : 116,
                                         "source_range" : [
                                           {
                                             "column" : 51
@@ -2469,7 +2491,7 @@
                                       [
                                         ["ImplicitCastExpr" , [
                                           {
-                                            "pointer" : 115,
+                                            "pointer" : 117,
                                             "source_range" : [
                                               {
                                                 "column" : 51
@@ -2482,7 +2504,7 @@
                                           [
                                             ["DeclRefExpr" , [
                                               {
-                                                "pointer" : 116,
+                                                "pointer" : 118,
                                                 "source_range" : [
                                                   {
                                                     "column" : 51
@@ -2496,13 +2518,13 @@
                                               ],
                                               {
                                                 "qual_type" : {
-                                                  "type_ptr" : 101
+                                                  "type_ptr" : 103
                                                 }
                                               },
                                               {
                                                 "decl_ref" : {
                                                   "kind" : "Function",
-                                                  "decl_pointer" : 100,
+                                                  "decl_pointer" : 102,
                                                   "name" : {
                                                     "name" : "ABFDataCreate",
                                                     "qual_name" : [
@@ -2510,7 +2532,7 @@
                                                     ]
                                                   },
                                                   "qual_type" : {
-                                                    "type_ptr" : 101
+                                                    "type_ptr" : 103
                                                   }
                                                 }
                                               }
@@ -2518,7 +2540,7 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 117
+                                              "type_ptr" : 119
                                             }
                                           },
                                           {
@@ -2530,14 +2552,14 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 118
+                                          "type_ptr" : 120
                                         }
                                       }
                                     ]]
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 119
+                                      "type_ptr" : 121
                                     }
                                   },
                                   {
@@ -2546,7 +2568,7 @@
                                     ]
                                   },
                                   {
-                                    "type_ptr" : 119
+                                    "type_ptr" : 121
                                   },
                                   {
                                     "cast_kind" : "OBC_BridgeTransfer"
@@ -2555,7 +2577,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 119
+                                  "type_ptr" : 121
                                 }
                               },
                               {
@@ -2567,7 +2589,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 119
+                              "type_ptr" : 121
                             }
                           },
                           {
@@ -2588,7 +2610,7 @@
       {
         "class_interface" : {
           "kind" : "ObjCInterface",
-          "decl_pointer" : 102,
+          "decl_pointer" : 104,
           "name" : {
             "name" : "A",
             "qual_name" : [
@@ -2600,7 +2622,7 @@
     ]],
     ["TypedefDecl" , [
       {
-        "pointer" : 121,
+        "pointer" : 123,
         "source_range" : [
           {
           },
@@ -2636,31 +2658,31 @@
     "types" : [
       ["BuiltinType" , [
         {
-          "pointer" : 105
+          "pointer" : 107
         },
         "Void"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 122
+          "pointer" : 124
         },
         "Bool"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 123
+          "pointer" : 125
         },
         "Char_S"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 124
+          "pointer" : 126
         },
         "SChar"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 125
+          "pointer" : 127
         },
         "Short"
       ]],
@@ -2672,25 +2694,25 @@
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 126
+          "pointer" : 128
         },
         "Long"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 127
+          "pointer" : 129
         },
         "LongLong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 128
+          "pointer" : 130
         },
         "UChar"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 129
+          "pointer" : 131
         },
         "UShort"
       ]],
@@ -2702,369 +2724,375 @@
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 130
+          "pointer" : 132
         },
         "ULong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 131
+          "pointer" : 133
         },
         "ULongLong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 132
+          "pointer" : 134
         },
         "Float"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 133
+          "pointer" : 135
         },
         "Double"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 134
+          "pointer" : 136
         },
         "LongDouble"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 135
+          "pointer" : 137
         },
         "Float128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 136
+          "pointer" : 138
         },
         "Float16"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 137
+          "pointer" : 139
         },
         "ShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 138
+          "pointer" : 140
         },
         "Accum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 139
+          "pointer" : 141
         },
         "LongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 140
+          "pointer" : 142
         },
         "UShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 141
+          "pointer" : 143
         },
         "UAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 142
+          "pointer" : 144
         },
         "ULongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 143
+          "pointer" : 145
         },
         "ShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 144
+          "pointer" : 146
         },
         "Fract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 145
+          "pointer" : 147
         },
         "LongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 146
+          "pointer" : 148
         },
         "UShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 147
+          "pointer" : 149
         },
         "UFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 148
+          "pointer" : 150
         },
         "ULongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 149
+          "pointer" : 151
         },
         "SatShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 150
+          "pointer" : 152
         },
         "SatAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 151
+          "pointer" : 153
         },
         "SatLongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 152
+          "pointer" : 154
         },
         "SatUShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 153
+          "pointer" : 155
         },
         "SatUAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 154
+          "pointer" : 156
         },
         "SatULongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 155
+          "pointer" : 157
         },
         "SatShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 156
+          "pointer" : 158
         },
         "SatFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 157
+          "pointer" : 159
         },
         "SatLongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 158
+          "pointer" : 160
         },
         "SatUShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 159
+          "pointer" : 161
         },
         "SatUFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 160
+          "pointer" : 162
         },
         "SatULongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 161
+          "pointer" : 163
         },
         "Int128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 162
+          "pointer" : 164
         },
         "UInt128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 163
+          "pointer" : 165
         },
         "WChar_S"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 164
+          "pointer" : 166
         },
         "Char8"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 165
+          "pointer" : 167
         },
         "Dependent"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 166
+          "pointer" : 168
         },
         "Overload"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 167
+          "pointer" : 169
         },
         "BoundMember"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 168
+          "pointer" : 170
         },
         "PseudoObject"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 169
+          "pointer" : 171
         },
         "UnknownAny"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 170
+          "pointer" : 172
         },
         "ARCUnbridgedCast"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 171
+          "pointer" : 173
         },
         "BuiltinFn"
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 172
+          "pointer" : 174
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 173
+          "pointer" : 175
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 174
+          "pointer" : 176
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 175
+          "pointer" : 177
         }
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 176
+          "pointer" : 178
         },
         "ObjCId"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 177
+          "pointer" : 179
         },
         "ObjCClass"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 178
+          "pointer" : 180
         },
         "ObjCSel"
       ]],
       ["PointerType" , [
         {
-          "pointer" : 179
+          "pointer" : 181
         },
         {
-          "type_ptr" : 105
+          "type_ptr" : 107
         }
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 180
+          "pointer" : 182
         },
         "NullPtr"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 181
+          "pointer" : 183
         },
         "Half"
       ]],
+      ["BuiltinType" , [
+        {
+          "pointer" : 184
+        },
+        "BFloat16"
+      ]],
       ["PointerType" , [
         {
-          "pointer" : 182
+          "pointer" : 185
         },
         {
-          "type_ptr" : 178
+          "type_ptr" : 180
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 183
+          "pointer" : 186
         },
         {
-          "base_type" : 176
+          "base_type" : 178
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 184
+          "pointer" : 187
         },
         {
-          "type_ptr" : 183
+          "type_ptr" : 186
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 185
+          "pointer" : 188
         },
         {
-          "base_type" : 177
+          "base_type" : 179
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 186
+          "pointer" : 189
         },
         {
-          "type_ptr" : 185
+          "type_ptr" : 188
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 187
+          "pointer" : 190
         },
         10
       ]],
       ["RecordType" , [
         {
-          "pointer" : 188
+          "pointer" : 191
         },
-        189
+        192
       ]],
       ["PointerType" , [
         {
-          "pointer" : 190
+          "pointer" : 193
         },
         {
           "type_ptr" : 53,
@@ -3073,34 +3101,34 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 191
+          "pointer" : 194
         },
         {
-          "type_ptr" : 123,
+          "type_ptr" : 125,
           "is_const" : true
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 192
+          "pointer" : 195
         },
         {
-          "type_ptr" : 123
+          "type_ptr" : 125
         }
       ]],
       ["RecordType" , [
         {
-          "pointer" : 193
+          "pointer" : 196
         },
-        194
+        197
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 195
+          "pointer" : 198
         },
         {
           "element_type" : {
-            "type_ptr" : 193
+            "type_ptr" : 196
           },
           "stride" : 24
         },
@@ -3108,18 +3136,18 @@
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 196
+          "pointer" : 199
         },
         18
       ]],
       ["TypedefType" , [
         {
           "pointer" : 7,
-          "desugared_type" : 184
+          "desugared_type" : 187
         },
         {
           "child_type" : {
-            "type_ptr" : 184
+            "type_ptr" : 187
           },
           "decl_ptr" : 6
         }
@@ -3127,23 +3155,23 @@
       ["TypedefType" , [
         {
           "pointer" : 21,
-          "desugared_type" : 184
+          "desugared_type" : 187
         },
         {
           "child_type" : {
             "type_ptr" : 7
           },
-          "decl_ptr" : 121
+          "decl_ptr" : 123
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 9,
-          "desugared_type" : 186
+          "desugared_type" : 189
         },
         {
           "child_type" : {
-            "type_ptr" : 186
+            "type_ptr" : 189
           },
           "decl_ptr" : 8
         }
@@ -3151,11 +3179,11 @@
       ["TypedefType" , [
         {
           "pointer" : 5,
-          "desugared_type" : 182
+          "desugared_type" : 185
         },
         {
           "child_type" : {
-            "type_ptr" : 182
+            "type_ptr" : 185
           },
           "decl_ptr" : 4
         }
@@ -3165,7 +3193,7 @@
           "pointer" : 30
         },
         {
-          "type_ptr" : 196
+          "type_ptr" : 199
         }
       ]],
       ["TypedefType" , [
@@ -3185,18 +3213,18 @@
           "pointer" : 47
         },
         {
-          "type_ptr" : 187
+          "type_ptr" : 190
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 197
+          "pointer" : 200
         },
         50
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 198
+          "pointer" : 201
         },
         56
       ]],
@@ -3217,29 +3245,29 @@
           "pointer" : 59
         },
         {
-          "type_ptr" : 198
+          "type_ptr" : 201
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 199
+          "pointer" : 202
         },
         61
       ]],
       ["IncompleteArrayType" , [
         {
-          "pointer" : 200
+          "pointer" : 203
         },
         {
           "element_type" : {
-            "type_ptr" : 184
+            "type_ptr" : 187
           },
           "stride" : 8
         }
       ]],
       ["IncompleteArrayType" , [
         {
-          "pointer" : 201
+          "pointer" : 204
         },
         {
           "element_type" : {
@@ -3251,7 +3279,7 @@
       ]],
       ["IncompleteArrayType" , [
         {
-          "pointer" : 202
+          "pointer" : 205
         },
         {
           "element_type" : {
@@ -3263,16 +3291,16 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 203
+          "pointer" : 206
         },
         {
-          "type_ptr" : 184,
+          "type_ptr" : 187,
           "is_const" : true
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 204
+          "pointer" : 207
         },
         {
           "type_ptr" : 7,
@@ -3282,10 +3310,10 @@
       ["DecayedType" , [
         {
           "pointer" : 64,
-          "desugared_type" : 204
+          "desugared_type" : 207
         },
         {
-          "type_ptr" : 204
+          "type_ptr" : 207
         }
       ]],
       ["ObjCObjectPointerType" , [
@@ -3293,21 +3321,21 @@
           "pointer" : 72
         },
         {
-          "type_ptr" : 199
+          "type_ptr" : 202
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 205
+          "pointer" : 208
         },
         74
       ]],
       ["PointerType" , [
         {
-          "pointer" : 206
+          "pointer" : 209
         },
         {
-          "type_ptr" : 184
+          "type_ptr" : 187
         }
       ]],
       ["PointerType" , [
@@ -3323,22 +3351,22 @@
           "pointer" : 85
         },
         {
-          "type_ptr" : 205
+          "type_ptr" : 208
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 207
+          "pointer" : 210
         },
         87
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 208
+          "pointer" : 211
         },
         {
           "return_type" : {
-            "type_ptr" : 105
+            "type_ptr" : 107
           }
         },
         {
@@ -3351,11 +3379,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 209
+          "pointer" : 212
         },
         {
           "return_type" : {
-            "type_ptr" : 105
+            "type_ptr" : 107
           }
         },
         {
@@ -3368,28 +3396,28 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 210
+          "pointer" : 213
         },
         {
           "return_type" : {
-            "type_ptr" : 105
+            "type_ptr" : 107
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 184
+              "type_ptr" : 187
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "return_type" : {
-            "type_ptr" : 105
+            "type_ptr" : 107
           }
         },
         {
@@ -3402,106 +3430,106 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 96
+          "pointer" : 98
         },
-        95
+        97
       ]],
       ["ElaboratedType" , [
         {
-          "pointer" : 211,
-          "desugared_type" : 96
+          "pointer" : 214,
+          "desugared_type" : 98
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 212
+          "pointer" : 215
         },
-        99
+        101
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 98,
-          "desugared_type" : 96
+          "pointer" : 100,
+          "desugared_type" : 98
         },
         {
           "child_type" : {
-            "type_ptr" : 211
+            "type_ptr" : 214
           },
-          "decl_ptr" : 97
+          "decl_ptr" : 99
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 213
+          "pointer" : 216
         },
         {
-          "type_ptr" : 96
+          "type_ptr" : 98
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 118
+          "pointer" : 120
         },
         {
-          "type_ptr" : 98
+          "type_ptr" : 100
         }
       ]],
       ["FunctionNoProtoType" , [
         {
-          "pointer" : 214
+          "pointer" : 217
         },
         {
           "return_type" : {
-            "type_ptr" : 213
+            "type_ptr" : 216
           }
         }
       ]],
       ["FunctionNoProtoType" , [
         {
-          "pointer" : 101
+          "pointer" : 103
         },
         {
           "return_type" : {
-            "type_ptr" : 118
+            "type_ptr" : 120
           }
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 215
+          "pointer" : 218
         },
-        102
+        104
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 107
+          "pointer" : 109
         },
         {
-          "type_ptr" : 215
+          "type_ptr" : 218
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 119
+          "pointer" : 121
         },
         {
-          "type_ptr" : 212
+          "type_ptr" : 215
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 216
+          "pointer" : 219
         },
         {
-          "type_ptr" : 214
+          "type_ptr" : 217
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 117
+          "pointer" : 119
         },
         {
-          "type_ptr" : 101
+          "type_ptr" : 103
         }
       ]],
       ["NoneType" , [
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCTest.m.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCTest.m.exp
index 18f657544..dc9a2bc7b 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCTest.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCTest.m.exp
@@ -1826,9 +1826,20 @@
         "is_implicit" : true,
         "is_used" : true,
         "attributes" : [
-          ["FormatAttr" , [
+          ["BuiltinAttr" , [
             {
               "pointer" : 89,
+              "source_range" : [
+                {
+                },
+                {
+                }
+              ]
+            }
+          ]],
+          ["FormatAttr" , [
+            {
+              "pointer" : 90,
               "source_range" : [
                 {
                   "column" : 13
@@ -1848,14 +1859,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 91,
+              "pointer" : 92,
               "source_range" : [
                 {
                 },
@@ -1881,7 +1892,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 92,
+        "pointer" : 93,
         "source_range" : [
           {
             "column" : 1
@@ -1893,9 +1904,20 @@
         "is_used" : true,
         "is_this_declaration_referenced" : true,
         "attributes" : [
+          ["BuiltinAttr" , [
+            {
+              "pointer" : 94,
+              "source_range" : [
+                {
+                },
+                {
+                }
+              ]
+            }
+          ]],
           ["FormatAttr" , [
             {
-              "pointer" : 93,
+              "pointer" : 95,
               "source_range" : [
                 {
                   "column" : 13
@@ -1915,14 +1937,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 94,
+              "pointer" : 96,
               "source_range" : [
                 {
                   "column" : 19
@@ -1950,7 +1972,7 @@
     ]],
     ["ObjCProtocolDecl" , [
       {
-        "pointer" : 95,
+        "pointer" : 97,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -1973,8 +1995,8 @@
       [
         ["ObjCPropertyDecl" , [
           {
-            "pointer" : 96,
-            "parent_pointer" : 95,
+            "pointer" : 98,
+            "parent_pointer" : 97,
             "source_range" : [
               {
                 "line" : 11,
@@ -1998,7 +2020,7 @@
             },
             "getter_method" : {
               "kind" : "ObjCMethod",
-              "decl_pointer" : 97,
+              "decl_pointer" : 99,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2009,7 +2031,7 @@
             },
             "setter_method" : {
               "kind" : "ObjCMethod",
-              "decl_pointer" : 98,
+              "decl_pointer" : 100,
               "name" : {
                 "name" : "setStr:",
                 "qual_name" : [
@@ -2027,8 +2049,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 97,
-            "parent_pointer" : 95,
+            "pointer" : 99,
+            "parent_pointer" : 97,
             "source_range" : [
               {
                 "column" : 38
@@ -2054,7 +2076,7 @@
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 96,
+              "decl_pointer" : 98,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2066,7 +2088,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 99,
+                  "pointer" : 101,
                   "source_range" : [
                     {
                     },
@@ -2090,7 +2112,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 100,
+                  "pointer" : 102,
                   "source_range" : [
                     {
                     },
@@ -2117,8 +2139,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 98,
-            "parent_pointer" : 95,
+            "pointer" : 100,
+            "parent_pointer" : 97,
             "source_range" : [
               {
                 "column" : 38
@@ -2139,12 +2161,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 96,
+              "decl_pointer" : 98,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2156,7 +2178,7 @@
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 102,
+                  "pointer" : 104,
                   "source_range" : [
                     {
                       "column" : 38
@@ -2183,7 +2205,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 103,
+                  "pointer" : 105,
                   "source_range" : [
                     {
                     },
@@ -2207,7 +2229,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 104,
+                  "pointer" : 106,
                   "source_range" : [
                     {
                     },
@@ -2240,7 +2262,7 @@
     ]],
     ["ObjCProtocolDecl" , [
       {
-        "pointer" : 105,
+        "pointer" : 107,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -2267,7 +2289,7 @@
     ]],
     ["ObjCInterfaceDecl" , [
       {
-        "pointer" : 106,
+        "pointer" : 108,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -2289,8 +2311,8 @@
       [
         ["ObjCPropertyDecl" , [
           {
-            "pointer" : 107,
-            "parent_pointer" : 106,
+            "pointer" : 109,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "line" : 18,
@@ -2314,7 +2336,7 @@
             },
             "getter_method" : {
               "kind" : "ObjCMethod",
-              "decl_pointer" : 108,
+              "decl_pointer" : 110,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2325,7 +2347,7 @@
             },
             "setter_method" : {
               "kind" : "ObjCMethod",
-              "decl_pointer" : 109,
+              "decl_pointer" : 111,
               "name" : {
                 "name" : "setStr:",
                 "qual_name" : [
@@ -2336,7 +2358,7 @@
             },
             "ivar_decl" : {
               "kind" : "ObjCIvar",
-              "decl_pointer" : 110,
+              "decl_pointer" : 112,
               "name" : {
                 "name" : "_str",
                 "qual_name" : [
@@ -2357,8 +2379,8 @@
         ]],
         ["ObjCPropertyDecl" , [
           {
-            "pointer" : 111,
-            "parent_pointer" : 106,
+            "pointer" : 113,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "line" : 20,
@@ -2378,11 +2400,11 @@
           },
           {
             "qual_type" : {
-              "type_ptr" : 112
+              "type_ptr" : 114
             },
             "getter_method" : {
               "kind" : "ObjCMethod",
-              "decl_pointer" : 113,
+              "decl_pointer" : 115,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -2393,7 +2415,7 @@
             },
             "setter_method" : {
               "kind" : "ObjCMethod",
-              "decl_pointer" : 114,
+              "decl_pointer" : 116,
               "name" : {
                 "name" : "setX:",
                 "qual_name" : [
@@ -2404,7 +2426,7 @@
             },
             "ivar_decl" : {
               "kind" : "ObjCIvar",
-              "decl_pointer" : 115,
+              "decl_pointer" : 117,
               "name" : {
                 "name" : "_x",
                 "qual_name" : [
@@ -2413,7 +2435,7 @@
                 ]
               },
               "qual_type" : {
-                "type_ptr" : 112
+                "type_ptr" : 114
               }
             },
             "property_attributes" : [
@@ -2426,8 +2448,8 @@
         ]],
         ["ObjCPropertyDecl" , [
           {
-            "pointer" : 116,
-            "parent_pointer" : 106,
+            "pointer" : 118,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "line" : 21,
@@ -2451,7 +2473,7 @@
             },
             "getter_method" : {
               "kind" : "ObjCMethod",
-              "decl_pointer" : 117,
+              "decl_pointer" : 119,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -2462,7 +2484,7 @@
             },
             "setter_method" : {
               "kind" : "ObjCMethod",
-              "decl_pointer" : 118,
+              "decl_pointer" : 120,
               "name" : {
                 "name" : "setY:",
                 "qual_name" : [
@@ -2473,7 +2495,7 @@
             },
             "ivar_decl" : {
               "kind" : "ObjCIvar",
-              "decl_pointer" : 119,
+              "decl_pointer" : 121,
               "name" : {
                 "name" : "_y",
                 "qual_name" : [
@@ -2495,8 +2517,8 @@
         ]],
         ["ObjCPropertyDecl" , [
           {
-            "pointer" : 120,
-            "parent_pointer" : 106,
+            "pointer" : 122,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "line" : 22,
@@ -2516,11 +2538,11 @@
           },
           {
             "qual_type" : {
-              "type_ptr" : 121
+              "type_ptr" : 123
             },
             "getter_method" : {
               "kind" : "ObjCMethod",
-              "decl_pointer" : 122,
+              "decl_pointer" : 124,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -2531,7 +2553,7 @@
             },
             "setter_method" : {
               "kind" : "ObjCMethod",
-              "decl_pointer" : 123,
+              "decl_pointer" : 125,
               "name" : {
                 "name" : "setDelegate:",
                 "qual_name" : [
@@ -2542,7 +2564,7 @@
             },
             "ivar_decl" : {
               "kind" : "ObjCIvar",
-              "decl_pointer" : 124,
+              "decl_pointer" : 126,
               "name" : {
                 "name" : "_delegate",
                 "qual_name" : [
@@ -2551,7 +2573,7 @@
                 ]
               },
               "qual_type" : {
-                "type_ptr" : 121
+                "type_ptr" : 123
               }
             },
             "property_attributes" : [
@@ -2564,8 +2586,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 108,
-            "parent_pointer" : 106,
+            "pointer" : 110,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "line" : 18,
@@ -2592,7 +2614,7 @@
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 107,
+              "decl_pointer" : 109,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2604,7 +2626,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 125,
+                  "pointer" : 127,
                   "source_range" : [
                     {
                     },
@@ -2620,7 +2642,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -2628,7 +2650,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 127,
+                  "pointer" : 129,
                   "source_range" : [
                     {
                     },
@@ -2656,8 +2678,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 109,
-            "parent_pointer" : 106,
+            "pointer" : 111,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "column" : 38
@@ -2678,12 +2700,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 107,
+              "decl_pointer" : 109,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2695,7 +2717,7 @@
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 128,
+                  "pointer" : 130,
                   "source_range" : [
                     {
                       "column" : 38
@@ -2722,7 +2744,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 129,
+                  "pointer" : 131,
                   "source_range" : [
                     {
                     },
@@ -2738,7 +2760,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -2746,7 +2768,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 130,
+                  "pointer" : 132,
                   "source_range" : [
                     {
                     },
@@ -2774,8 +2796,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 113,
-            "parent_pointer" : 106,
+            "pointer" : 115,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "line" : 20,
@@ -2797,12 +2819,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 112
+              "type_ptr" : 114
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 111,
+              "decl_pointer" : 113,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -2814,7 +2836,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 131,
+                  "pointer" : 133,
                   "source_range" : [
                     {
                     },
@@ -2830,7 +2852,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -2838,7 +2860,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 132,
+                  "pointer" : 134,
                   "source_range" : [
                     {
                     },
@@ -2865,8 +2887,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 114,
-            "parent_pointer" : 106,
+            "pointer" : 116,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "column" : 36
@@ -2887,12 +2909,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 111,
+              "decl_pointer" : 113,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -2904,7 +2926,7 @@
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 133,
+                  "pointer" : 135,
                   "source_range" : [
                     {
                       "column" : 36
@@ -2921,7 +2943,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 112
+                  "type_ptr" : 114
                 },
                 {
                   "parm_index_in_function" : 0
@@ -2931,7 +2953,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 134,
+                  "pointer" : 136,
                   "source_range" : [
                     {
                     },
@@ -2947,7 +2969,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -2955,7 +2977,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 135,
+                  "pointer" : 137,
                   "source_range" : [
                     {
                     },
@@ -2982,8 +3004,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 117,
-            "parent_pointer" : 106,
+            "pointer" : 119,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "line" : 21,
@@ -3010,7 +3032,7 @@
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 116,
+              "decl_pointer" : 118,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -3022,7 +3044,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 136,
+                  "pointer" : 138,
                   "source_range" : [
                     {
                     },
@@ -3038,7 +3060,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3046,7 +3068,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 137,
+                  "pointer" : 139,
                   "source_range" : [
                     {
                     },
@@ -3073,8 +3095,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 118,
-            "parent_pointer" : 106,
+            "pointer" : 120,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "column" : 34
@@ -3095,12 +3117,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 116,
+              "decl_pointer" : 118,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -3112,7 +3134,7 @@
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 138,
+                  "pointer" : 140,
                   "source_range" : [
                     {
                       "column" : 34
@@ -3139,7 +3161,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 139,
+                  "pointer" : 141,
                   "source_range" : [
                     {
                     },
@@ -3155,7 +3177,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3163,7 +3185,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 140,
+                  "pointer" : 142,
                   "source_range" : [
                     {
                     },
@@ -3190,8 +3212,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 122,
-            "parent_pointer" : 106,
+            "pointer" : 124,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "line" : 22,
@@ -3213,12 +3235,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 121
+              "type_ptr" : 123
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 120,
+              "decl_pointer" : 122,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -3230,7 +3252,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 141,
+                  "pointer" : 143,
                   "source_range" : [
                     {
                     },
@@ -3246,7 +3268,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3254,7 +3276,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 142,
+                  "pointer" : 144,
                   "source_range" : [
                     {
                     },
@@ -3281,8 +3303,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 123,
-            "parent_pointer" : 106,
+            "pointer" : 125,
+            "parent_pointer" : 108,
             "source_range" : [
               {
                 "column" : 54
@@ -3303,12 +3325,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 120,
+              "decl_pointer" : 122,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -3320,7 +3342,7 @@
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 143,
+                  "pointer" : 145,
                   "source_range" : [
                     {
                       "column" : 54
@@ -3337,7 +3359,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 121
+                  "type_ptr" : 123
                 },
                 {
                   "parm_index_in_function" : 0
@@ -3347,7 +3369,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 144,
+                  "pointer" : 146,
                   "source_range" : [
                     {
                     },
@@ -3363,7 +3385,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3371,7 +3393,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 145,
+                  "pointer" : 147,
                   "source_range" : [
                     {
                     },
@@ -3412,7 +3434,7 @@
         },
         "implementation" : {
           "kind" : "ObjCImplementation",
-          "decl_pointer" : 146,
+          "decl_pointer" : 148,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -3423,7 +3445,7 @@
         "protocols" : [
           {
             "kind" : "ObjCProtocol",
-            "decl_pointer" : 95,
+            "decl_pointer" : 97,
             "name" : {
               "name" : "MyProtocol",
               "qual_name" : [
@@ -3435,7 +3457,7 @@
         "known_categories" : [
           {
             "kind" : "ObjCCategory",
-            "decl_pointer" : 147,
+            "decl_pointer" : 149,
             "name" : {
               "name" : "MyCategory",
               "qual_name" : [
@@ -3445,7 +3467,7 @@
           },
           {
             "kind" : "ObjCCategory",
-            "decl_pointer" : 148,
+            "decl_pointer" : 150,
             "name" : {
               "name" : "",
               "qual_name" : [
@@ -3458,7 +3480,7 @@
     ]],
     ["ObjCCategoryDecl" , [
       {
-        "pointer" : 148,
+        "pointer" : 150,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -3480,8 +3502,8 @@
       [
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 149,
-            "parent_pointer" : 148,
+            "pointer" : 151,
+            "parent_pointer" : 150,
             "source_range" : [
               {
                 "line" : 28,
@@ -3502,12 +3524,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 150,
+                  "pointer" : 152,
                   "source_range" : [
                     {
                       "column" : 14
@@ -3524,7 +3546,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 151
+                  "type_ptr" : 153
                 },
                 {
                   "parm_index_in_function" : 0
@@ -3534,7 +3556,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 152,
+                  "pointer" : 154,
                   "source_range" : [
                     {
                     },
@@ -3550,7 +3572,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3558,7 +3580,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 153,
+                  "pointer" : 155,
                   "source_range" : [
                     {
                     },
@@ -3589,7 +3611,7 @@
       {
         "class_interface" : {
           "kind" : "ObjCInterface",
-          "decl_pointer" : 106,
+          "decl_pointer" : 108,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -3601,7 +3623,7 @@
     ]],
     ["ObjCImplementationDecl" , [
       {
-        "pointer" : 146,
+        "pointer" : 148,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -3623,8 +3645,8 @@
       [
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 154,
-            "parent_pointer" : 146,
+            "pointer" : 156,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "line" : 34,
@@ -3646,12 +3668,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 155,
+                  "pointer" : 157,
                   "source_range" : [
                     {
                       "line" : 34,
@@ -3669,7 +3691,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 151
+                  "type_ptr" : 153
                 },
                 {
                   "parm_index_in_function" : 0
@@ -3679,7 +3701,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 156,
+                  "pointer" : 158,
                   "source_range" : [
                     {
                     },
@@ -3697,7 +3719,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3705,7 +3727,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 157,
+                  "pointer" : 159,
                   "source_range" : [
                     {
                     },
@@ -3729,7 +3751,7 @@
             ],
             "body" : ["CompoundStmt" , [
               {
-                "pointer" : 158,
+                "pointer" : 160,
                 "source_range" : [
                   {
                     "column" : 36
@@ -3743,7 +3765,7 @@
               [
                 ["CallExpr" , [
                   {
-                    "pointer" : 159,
+                    "pointer" : 161,
                     "source_range" : [
                       {
                         "line" : 36,
@@ -3757,7 +3779,7 @@
                   [
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 160,
+                        "pointer" : 162,
                         "source_range" : [
                           {
                             "column" : 3
@@ -3770,7 +3792,7 @@
                       [
                         ["DeclRefExpr" , [
                           {
-                            "pointer" : 161,
+                            "pointer" : 163,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -3784,13 +3806,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 90
+                              "type_ptr" : 91
                             }
                           },
                           {
                             "decl_ref" : {
                               "kind" : "Function",
-                              "decl_pointer" : 92,
+                              "decl_pointer" : 93,
                               "name" : {
                                 "name" : "NSLog",
                                 "qual_name" : [
@@ -3798,7 +3820,7 @@
                                 ]
                               },
                               "qual_type" : {
-                                "type_ptr" : 90
+                                "type_ptr" : 91
                               }
                             }
                           }
@@ -3806,7 +3828,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 162
+                          "type_ptr" : 164
                         }
                       },
                       {
@@ -3817,7 +3839,7 @@
                     ]],
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 163,
+                        "pointer" : 165,
                         "source_range" : [
                           {
                             "column" : 9
@@ -3830,7 +3852,7 @@
                       [
                         ["ObjCStringLiteral" , [
                           {
-                            "pointer" : 164,
+                            "pointer" : 166,
                             "source_range" : [
                               {
                                 "column" : 9
@@ -3843,7 +3865,7 @@
                           [
                             ["StringLiteral" , [
                               {
-                                "pointer" : 165,
+                                "pointer" : 167,
                                 "source_range" : [
                                   {
                                     "column" : 10
@@ -3857,7 +3879,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 166
+                                  "type_ptr" : 168
                                 },
                                 "value_kind" : "LValue"
                               },
@@ -3886,7 +3908,7 @@
                     ]],
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 167,
+                        "pointer" : 169,
                         "source_range" : [
                           {
                             "column" : 18
@@ -3899,7 +3921,7 @@
                       [
                         ["ObjCEncodeExpr" , [
                           {
-                            "pointer" : 168,
+                            "pointer" : 170,
                             "source_range" : [
                               {
                                 "column" : 18
@@ -3913,13 +3935,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 166
+                              "type_ptr" : 168
                             },
                             "value_kind" : "LValue"
                           },
                           {
                             "qual_type" : {
-                              "type_ptr" : 169
+                              "type_ptr" : 171
                             },
                             "raw" : "int **"
                           }
@@ -3927,7 +3949,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 170
+                          "type_ptr" : 172
                         }
                       },
                       {
@@ -3939,13 +3961,13 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 101
+                      "type_ptr" : 103
                     }
                   }
                 ]],
                 ["CallExpr" , [
                   {
-                    "pointer" : 171,
+                    "pointer" : 173,
                     "source_range" : [
                       {
                         "line" : 38,
@@ -3959,7 +3981,7 @@
                   [
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 172,
+                        "pointer" : 174,
                         "source_range" : [
                           {
                             "column" : 3
@@ -3972,7 +3994,7 @@
                       [
                         ["DeclRefExpr" , [
                           {
-                            "pointer" : 173,
+                            "pointer" : 175,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -3986,13 +4008,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 90
+                              "type_ptr" : 91
                             }
                           },
                           {
                             "decl_ref" : {
                               "kind" : "Function",
-                              "decl_pointer" : 92,
+                              "decl_pointer" : 93,
                               "name" : {
                                 "name" : "NSLog",
                                 "qual_name" : [
@@ -4000,7 +4022,7 @@
                                 ]
                               },
                               "qual_type" : {
-                                "type_ptr" : 90
+                                "type_ptr" : 91
                               }
                             }
                           }
@@ -4008,7 +4030,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 162
+                          "type_ptr" : 164
                         }
                       },
                       {
@@ -4019,7 +4041,7 @@
                     ]],
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 174,
+                        "pointer" : 176,
                         "source_range" : [
                           {
                             "column" : 9
@@ -4032,7 +4054,7 @@
                       [
                         ["ObjCStringLiteral" , [
                           {
-                            "pointer" : 175,
+                            "pointer" : 177,
                             "source_range" : [
                               {
                                 "column" : 9
@@ -4045,7 +4067,7 @@
                           [
                             ["StringLiteral" , [
                               {
-                                "pointer" : 176,
+                                "pointer" : 178,
                                 "source_range" : [
                                   {
                                     "column" : 10
@@ -4059,7 +4081,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 166
+                                  "type_ptr" : 168
                                 },
                                 "value_kind" : "LValue"
                               },
@@ -4088,7 +4110,7 @@
                     ]],
                     ["ObjCMessageExpr" , [
                       {
-                        "pointer" : 177,
+                        "pointer" : 179,
                         "source_range" : [
                           {
                             "column" : 18
@@ -4101,7 +4123,7 @@
                       [
                         ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 178,
+                            "pointer" : 180,
                             "source_range" : [
                               {
                                 "column" : 19
@@ -4114,7 +4136,7 @@
                           [
                             ["DeclRefExpr" , [
                               {
-                                "pointer" : 179,
+                                "pointer" : 181,
                                 "source_range" : [
                                   {
                                     "column" : 19
@@ -4128,7 +4150,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126,
+                                  "type_ptr" : 128,
                                   "is_const" : true
                                 },
                                 "value_kind" : "LValue"
@@ -4136,7 +4158,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : "ImplicitParam",
-                                  "decl_pointer" : 156,
+                                  "decl_pointer" : 158,
                                   "name" : {
                                     "name" : "self",
                                     "qual_name" : [
@@ -4144,7 +4166,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 126,
+                                    "type_ptr" : 128,
                                     "is_const" : true
                                   }
                                 }
@@ -4153,7 +4175,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
@@ -4164,7 +4186,7 @@
                         ]],
                         ["ObjCSelectorExpr" , [
                           {
-                            "pointer" : 180,
+                            "pointer" : 182,
                             "source_range" : [
                               {
                                 "column" : 43
@@ -4197,13 +4219,13 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 101
+                      "type_ptr" : 103
                     }
                   }
                 ]],
                 ["CallExpr" , [
                   {
-                    "pointer" : 181,
+                    "pointer" : 183,
                     "source_range" : [
                       {
                         "line" : 40,
@@ -4217,7 +4239,7 @@
                   [
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 182,
+                        "pointer" : 184,
                         "source_range" : [
                           {
                             "column" : 3
@@ -4230,7 +4252,7 @@
                       [
                         ["DeclRefExpr" , [
                           {
-                            "pointer" : 183,
+                            "pointer" : 185,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -4244,13 +4266,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 90
+                              "type_ptr" : 91
                             }
                           },
                           {
                             "decl_ref" : {
                               "kind" : "Function",
-                              "decl_pointer" : 92,
+                              "decl_pointer" : 93,
                               "name" : {
                                 "name" : "NSLog",
                                 "qual_name" : [
@@ -4258,7 +4280,7 @@
                                 ]
                               },
                               "qual_type" : {
-                                "type_ptr" : 90
+                                "type_ptr" : 91
                               }
                             }
                           }
@@ -4266,7 +4288,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 162
+                          "type_ptr" : 164
                         }
                       },
                       {
@@ -4277,7 +4299,7 @@
                     ]],
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 184,
+                        "pointer" : 186,
                         "source_range" : [
                           {
                             "column" : 9
@@ -4290,7 +4312,7 @@
                       [
                         ["ObjCStringLiteral" , [
                           {
-                            "pointer" : 185,
+                            "pointer" : 187,
                             "source_range" : [
                               {
                                 "column" : 9
@@ -4303,7 +4325,7 @@
                           [
                             ["StringLiteral" , [
                               {
-                                "pointer" : 186,
+                                "pointer" : 188,
                                 "source_range" : [
                                   {
                                     "column" : 10
@@ -4317,7 +4339,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 166
+                                  "type_ptr" : 168
                                 },
                                 "value_kind" : "LValue"
                               },
@@ -4346,7 +4368,7 @@
                     ]],
                     ["ObjCMessageExpr" , [
                       {
-                        "pointer" : 187,
+                        "pointer" : 189,
                         "source_range" : [
                           {
                             "column" : 18
@@ -4359,7 +4381,7 @@
                       [
                         ["ObjCMessageExpr" , [
                           {
-                            "pointer" : 188,
+                            "pointer" : 190,
                             "source_range" : [
                               {
                                 "column" : 19
@@ -4372,7 +4394,7 @@
                           [
                             ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 189,
+                                "pointer" : 191,
                                 "source_range" : [
                                   {
                                     "column" : 20
@@ -4385,7 +4407,7 @@
                               [
                                 ["DeclRefExpr" , [
                                   {
-                                    "pointer" : 190,
+                                    "pointer" : 192,
                                     "source_range" : [
                                       {
                                         "column" : 20
@@ -4399,7 +4421,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126,
+                                      "type_ptr" : 128,
                                       "is_const" : true
                                     },
                                     "value_kind" : "LValue"
@@ -4407,7 +4429,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : "ImplicitParam",
-                                      "decl_pointer" : 156,
+                                      "decl_pointer" : 158,
                                       "name" : {
                                         "name" : "self",
                                         "qual_name" : [
@@ -4415,7 +4437,7 @@
                                         ]
                                       },
                                       "qual_type" : {
-                                        "type_ptr" : 126,
+                                        "type_ptr" : 128,
                                         "is_const" : true
                                       }
                                     }
@@ -4424,7 +4446,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -4446,7 +4468,7 @@
                         ]],
                         ["ObjCProtocolExpr" , [
                           {
-                            "pointer" : 191,
+                            "pointer" : 193,
                             "source_range" : [
                               {
                                 "column" : 51
@@ -4465,7 +4487,7 @@
                           },
                           {
                             "kind" : "ObjCProtocol",
-                            "decl_pointer" : 95,
+                            "decl_pointer" : 97,
                             "name" : {
                               "name" : "MyProtocol",
                               "qual_name" : [
@@ -4488,13 +4510,13 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 101
+                      "type_ptr" : 103
                     }
                   }
                 ]],
                 ["DeclStmt" , [
                   {
-                    "pointer" : 192,
+                    "pointer" : 194,
                     "source_range" : [
                       {
                         "line" : 42,
@@ -4509,7 +4531,7 @@
                   [
                     ["ExprWithCleanups" , [
                       {
-                        "pointer" : 193,
+                        "pointer" : 195,
                         "source_range" : [
                           {
                             "line" : 42,
@@ -4524,7 +4546,7 @@
                       [
                         ["BlockExpr" , [
                           {
-                            "pointer" : 194,
+                            "pointer" : 196,
                             "source_range" : [
                               {
                                 "line" : 42,
@@ -4540,13 +4562,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 195
+                              "type_ptr" : 197
                             }
                           },
                           ["BlockDecl" , [
                             {
-                              "pointer" : 196,
-                              "parent_pointer" : 154,
+                              "pointer" : 198,
+                              "parent_pointer" : 156,
                               "source_range" : [
                                 {
                                   "line" : 42,
@@ -4562,7 +4584,7 @@
                               "parameters" : [
                                 ["ParmVarDecl" , [
                                   {
-                                    "pointer" : 197,
+                                    "pointer" : 199,
                                     "source_range" : [
                                       {
                                         "line" : 42,
@@ -4593,7 +4615,7 @@
                                 {
                                   "variable" : {
                                     "kind" : "ImplicitParam",
-                                    "decl_pointer" : 156,
+                                    "decl_pointer" : 158,
                                     "name" : {
                                       "name" : "self",
                                       "qual_name" : [
@@ -4601,7 +4623,7 @@
                                       ]
                                     },
                                     "qual_type" : {
-                                      "type_ptr" : 126,
+                                      "type_ptr" : 128,
                                       "is_const" : true
                                     }
                                   }
@@ -4609,7 +4631,7 @@
                               ],
                               "body" : ["CompoundStmt" , [
                                 {
-                                  "pointer" : 198,
+                                  "pointer" : 200,
                                   "source_range" : [
                                     {
                                       "column" : 53
@@ -4623,7 +4645,7 @@
                                 [
                                   ["PseudoObjectExpr" , [
                                     {
-                                      "pointer" : 199,
+                                      "pointer" : 201,
                                       "source_range" : [
                                         {
                                           "line" : 43,
@@ -4637,7 +4659,7 @@
                                     [
                                       ["BinaryOperator" , [
                                         {
-                                          "pointer" : 200,
+                                          "pointer" : 202,
                                           "source_range" : [
                                             {
                                               "column" : 5
@@ -4650,7 +4672,7 @@
                                         [
                                           ["ObjCPropertyRefExpr" , [
                                             {
-                                              "pointer" : 201,
+                                              "pointer" : 203,
                                               "source_range" : [
                                                 {
                                                   "column" : 5
@@ -4663,7 +4685,7 @@
                                             [
                                               ["OpaqueValueExpr" , [
                                                 {
-                                                  "pointer" : 202,
+                                                  "pointer" : 204,
                                                   "source_range" : [
                                                     {
                                                       "column" : 5
@@ -4677,13 +4699,13 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 126
+                                                    "type_ptr" : 128
                                                   }
                                                 },
                                                 {
                                                   "source_expr" : ["ImplicitCastExpr" , [
                                                     {
-                                                      "pointer" : 203,
+                                                      "pointer" : 205,
                                                       "source_range" : [
                                                         {
                                                           "column" : 5
@@ -4696,7 +4718,7 @@
                                                     [
                                                       ["DeclRefExpr" , [
                                                         {
-                                                          "pointer" : 204,
+                                                          "pointer" : 206,
                                                           "source_range" : [
                                                             {
                                                               "column" : 5
@@ -4710,7 +4732,7 @@
                                                         ],
                                                         {
                                                           "qual_type" : {
-                                                            "type_ptr" : 126,
+                                                            "type_ptr" : 128,
                                                             "is_const" : true
                                                           },
                                                           "value_kind" : "LValue"
@@ -4718,7 +4740,7 @@
                                                         {
                                                           "decl_ref" : {
                                                             "kind" : "ImplicitParam",
-                                                            "decl_pointer" : 156,
+                                                            "decl_pointer" : 158,
                                                             "name" : {
                                                               "name" : "self",
                                                               "qual_name" : [
@@ -4726,7 +4748,7 @@
                                                               ]
                                                             },
                                                             "qual_type" : {
-                                                              "type_ptr" : 126,
+                                                              "type_ptr" : 128,
                                                               "is_const" : true
                                                             }
                                                           }
@@ -4735,7 +4757,7 @@
                                                     ],
                                                     {
                                                       "qual_type" : {
-                                                        "type_ptr" : 126
+                                                        "type_ptr" : 128
                                                       }
                                                     },
                                                     {
@@ -4749,7 +4771,7 @@
                                             ],
                                             {
                                               "qual_type" : {
-                                                "type_ptr" : 205
+                                                "type_ptr" : 207
                                               },
                                               "value_kind" : "LValue",
                                               "object_kind" : "ObjCProperty"
@@ -4757,7 +4779,7 @@
                                             {
                                               "kind" : ["PropertyRef" , {
                                                 "kind" : "ObjCProperty",
-                                                "decl_pointer" : 107,
+                                                "decl_pointer" : 109,
                                                 "name" : {
                                                   "name" : "str",
                                                   "qual_name" : [
@@ -4771,7 +4793,7 @@
                                           ]],
                                           ["OpaqueValueExpr" , [
                                             {
-                                              "pointer" : 206,
+                                              "pointer" : 208,
                                               "source_range" : [
                                                 {
                                                   "column" : 16
@@ -4792,7 +4814,7 @@
                                             {
                                               "source_expr" : ["DeclRefExpr" , [
                                                 {
-                                                  "pointer" : 207,
+                                                  "pointer" : 209,
                                                   "source_range" : [
                                                     {
                                                       "column" : 16
@@ -4813,7 +4835,7 @@
                                                 {
                                                   "decl_ref" : {
                                                     "kind" : "ParmVar",
-                                                    "decl_pointer" : 197,
+                                                    "decl_pointer" : 199,
                                                     "name" : {
                                                       "name" : "x",
                                                       "qual_name" : [
@@ -4841,7 +4863,7 @@
                                       ]],
                                       ["OpaqueValueExpr" , [
                                         {
-                                          "pointer" : 202,
+                                          "pointer" : 204,
                                           "source_range" : [
                                             {
                                               "column" : 5
@@ -4855,13 +4877,13 @@
                                         ],
                                         {
                                           "qual_type" : {
-                                            "type_ptr" : 126
+                                            "type_ptr" : 128
                                           }
                                         },
                                         {
                                           "source_expr" : ["ImplicitCastExpr" , [
                                             {
-                                              "pointer" : 203,
+                                              "pointer" : 205,
                                               "source_range" : [
                                                 {
                                                   "column" : 5
@@ -4874,7 +4896,7 @@
                                             [
                                               ["DeclRefExpr" , [
                                                 {
-                                                  "pointer" : 204,
+                                                  "pointer" : 206,
                                                   "source_range" : [
                                                     {
                                                       "column" : 5
@@ -4888,7 +4910,7 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 126,
+                                                    "type_ptr" : 128,
                                                     "is_const" : true
                                                   },
                                                   "value_kind" : "LValue"
@@ -4896,7 +4918,7 @@
                                                 {
                                                   "decl_ref" : {
                                                     "kind" : "ImplicitParam",
-                                                    "decl_pointer" : 156,
+                                                    "decl_pointer" : 158,
                                                     "name" : {
                                                       "name" : "self",
                                                       "qual_name" : [
@@ -4904,7 +4926,7 @@
                                                       ]
                                                     },
                                                     "qual_type" : {
-                                                      "type_ptr" : 126,
+                                                      "type_ptr" : 128,
                                                       "is_const" : true
                                                     }
                                                   }
@@ -4913,7 +4935,7 @@
                                             ],
                                             {
                                               "qual_type" : {
-                                                "type_ptr" : 126
+                                                "type_ptr" : 128
                                               }
                                             },
                                             {
@@ -4926,7 +4948,7 @@
                                       ]],
                                       ["OpaqueValueExpr" , [
                                         {
-                                          "pointer" : 206,
+                                          "pointer" : 208,
                                           "source_range" : [
                                             {
                                               "column" : 16
@@ -4947,7 +4969,7 @@
                                         {
                                           "source_expr" : ["DeclRefExpr" , [
                                             {
-                                              "pointer" : 207,
+                                              "pointer" : 209,
                                               "source_range" : [
                                                 {
                                                   "column" : 16
@@ -4968,7 +4990,7 @@
                                             {
                                               "decl_ref" : {
                                                 "kind" : "ParmVar",
-                                                "decl_pointer" : 197,
+                                                "decl_pointer" : 199,
                                                 "name" : {
                                                   "name" : "x",
                                                   "qual_name" : [
@@ -4985,7 +5007,7 @@
                                       ]],
                                       ["OpaqueValueExpr" , [
                                         {
-                                          "pointer" : 208,
+                                          "pointer" : 210,
                                           "source_range" : [
                                             {
                                               "column" : 16
@@ -5005,7 +5027,7 @@
                                         {
                                           "source_expr" : ["ImplicitCastExpr" , [
                                             {
-                                              "pointer" : 209,
+                                              "pointer" : 211,
                                               "source_range" : [
                                                 {
                                                   "column" : 16
@@ -5018,7 +5040,7 @@
                                             [
                                               ["OpaqueValueExpr" , [
                                                 {
-                                                  "pointer" : 206,
+                                                  "pointer" : 208,
                                                   "source_range" : [
                                                     {
                                                       "column" : 16
@@ -5039,7 +5061,7 @@
                                                 {
                                                   "source_expr" : ["DeclRefExpr" , [
                                                     {
-                                                      "pointer" : 207,
+                                                      "pointer" : 209,
                                                       "source_range" : [
                                                         {
                                                           "column" : 16
@@ -5060,7 +5082,7 @@
                                                     {
                                                       "decl_ref" : {
                                                         "kind" : "ParmVar",
-                                                        "decl_pointer" : 197,
+                                                        "decl_pointer" : 199,
                                                         "name" : {
                                                           "name" : "x",
                                                           "qual_name" : [
@@ -5091,7 +5113,7 @@
                                       ]],
                                       ["ObjCMessageExpr" , [
                                         {
-                                          "pointer" : 210,
+                                          "pointer" : 212,
                                           "source_range" : [
                                             {
                                               "column" : 10
@@ -5104,7 +5126,7 @@
                                         [
                                           ["OpaqueValueExpr" , [
                                             {
-                                              "pointer" : 202,
+                                              "pointer" : 204,
                                               "source_range" : [
                                                 {
                                                   "column" : 5
@@ -5118,13 +5140,13 @@
                                             ],
                                             {
                                               "qual_type" : {
-                                                "type_ptr" : 126
+                                                "type_ptr" : 128
                                               }
                                             },
                                             {
                                               "source_expr" : ["ImplicitCastExpr" , [
                                                 {
-                                                  "pointer" : 203,
+                                                  "pointer" : 205,
                                                   "source_range" : [
                                                     {
                                                       "column" : 5
@@ -5137,7 +5159,7 @@
                                                 [
                                                   ["DeclRefExpr" , [
                                                     {
-                                                      "pointer" : 204,
+                                                      "pointer" : 206,
                                                       "source_range" : [
                                                         {
                                                           "column" : 5
@@ -5151,7 +5173,7 @@
                                                     ],
                                                     {
                                                       "qual_type" : {
-                                                        "type_ptr" : 126,
+                                                        "type_ptr" : 128,
                                                         "is_const" : true
                                                       },
                                                       "value_kind" : "LValue"
@@ -5159,7 +5181,7 @@
                                                     {
                                                       "decl_ref" : {
                                                         "kind" : "ImplicitParam",
-                                                        "decl_pointer" : 156,
+                                                        "decl_pointer" : 158,
                                                         "name" : {
                                                           "name" : "self",
                                                           "qual_name" : [
@@ -5167,7 +5189,7 @@
                                                           ]
                                                         },
                                                         "qual_type" : {
-                                                          "type_ptr" : 126,
+                                                          "type_ptr" : 128,
                                                           "is_const" : true
                                                         }
                                                       }
@@ -5176,7 +5198,7 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 126
+                                                    "type_ptr" : 128
                                                   }
                                                 },
                                                 {
@@ -5189,7 +5211,7 @@
                                           ]],
                                           ["OpaqueValueExpr" , [
                                             {
-                                              "pointer" : 208,
+                                              "pointer" : 210,
                                               "source_range" : [
                                                 {
                                                   "column" : 16
@@ -5209,7 +5231,7 @@
                                             {
                                               "source_expr" : ["ImplicitCastExpr" , [
                                                 {
-                                                  "pointer" : 209,
+                                                  "pointer" : 211,
                                                   "source_range" : [
                                                     {
                                                       "column" : 16
@@ -5222,7 +5244,7 @@
                                                 [
                                                   ["OpaqueValueExpr" , [
                                                     {
-                                                      "pointer" : 206,
+                                                      "pointer" : 208,
                                                       "source_range" : [
                                                         {
                                                           "column" : 16
@@ -5243,7 +5265,7 @@
                                                     {
                                                       "source_expr" : ["DeclRefExpr" , [
                                                         {
-                                                          "pointer" : 207,
+                                                          "pointer" : 209,
                                                           "source_range" : [
                                                             {
                                                               "column" : 16
@@ -5264,7 +5286,7 @@
                                                         {
                                                           "decl_ref" : {
                                                             "kind" : "ParmVar",
-                                                            "decl_pointer" : 197,
+                                                            "decl_pointer" : 199,
                                                             "name" : {
                                                               "name" : "x",
                                                               "qual_name" : [
@@ -5296,13 +5318,13 @@
                                         ],
                                         {
                                           "qual_type" : {
-                                            "type_ptr" : 101
+                                            "type_ptr" : 103
                                           }
                                         },
                                         {
                                           "selector" : "setStr:",
                                           "is_definition_found" : true,
-                                          "decl_pointer" : 211
+                                          "decl_pointer" : 213
                                         }
                                       ]]
                                     ],
@@ -5314,7 +5336,7 @@
                                   ]],
                                   ["ReturnStmt" , [
                                     {
-                                      "pointer" : 212,
+                                      "pointer" : 214,
                                       "source_range" : [
                                         {
                                           "line" : 44,
@@ -5328,7 +5350,7 @@
                                     [
                                       ["ObjCMessageExpr" , [
                                         {
-                                          "pointer" : 213,
+                                          "pointer" : 215,
                                           "source_range" : [
                                             {
                                               "column" : 12
@@ -5341,7 +5363,7 @@
                                         [
                                           ["ImplicitCastExpr" , [
                                             {
-                                              "pointer" : 214,
+                                              "pointer" : 216,
                                               "source_range" : [
                                                 {
                                                   "column" : 13
@@ -5354,7 +5376,7 @@
                                             [
                                               ["DeclRefExpr" , [
                                                 {
-                                                  "pointer" : 215,
+                                                  "pointer" : 217,
                                                   "source_range" : [
                                                     {
                                                       "column" : 13
@@ -5375,7 +5397,7 @@
                                                 {
                                                   "decl_ref" : {
                                                     "kind" : "ParmVar",
-                                                    "decl_pointer" : 197,
+                                                    "decl_pointer" : 199,
                                                     "name" : {
                                                       "name" : "x",
                                                       "qual_name" : [
@@ -5422,14 +5444,14 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 195
+                          "type_ptr" : 197
                         }
                       },
                       {
                         "decl_refs" : [
                           {
                             "kind" : "Block",
-                            "decl_pointer" : 196
+                            "decl_pointer" : 198
                           }
                         ]
                       }
@@ -5438,7 +5460,7 @@
                   [
                     ["VarDecl" , [
                       {
-                        "pointer" : 216,
+                        "pointer" : 218,
                         "source_range" : [
                           {
                             "line" : 42,
@@ -5457,12 +5479,12 @@
                         ]
                       },
                       {
-                        "type_ptr" : 217
+                        "type_ptr" : 219
                       },
                       {
                         "init_expr" : ["ExprWithCleanups" , [
                           {
-                            "pointer" : 193,
+                            "pointer" : 195,
                             "source_range" : [
                               {
                                 "line" : 42,
@@ -5477,7 +5499,7 @@
                           [
                             ["BlockExpr" , [
                               {
-                                "pointer" : 194,
+                                "pointer" : 196,
                                 "source_range" : [
                                   {
                                     "line" : 42,
@@ -5493,13 +5515,13 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 195
+                                  "type_ptr" : 197
                                 }
                               },
                               ["BlockDecl" , [
                                 {
-                                  "pointer" : 196,
-                                  "parent_pointer" : 154,
+                                  "pointer" : 198,
+                                  "parent_pointer" : 156,
                                   "source_range" : [
                                     {
                                       "line" : 42,
@@ -5515,7 +5537,7 @@
                                   "parameters" : [
                                     ["ParmVarDecl" , [
                                       {
-                                        "pointer" : 197,
+                                        "pointer" : 199,
                                         "source_range" : [
                                           {
                                             "line" : 42,
@@ -5546,7 +5568,7 @@
                                     {
                                       "variable" : {
                                         "kind" : "ImplicitParam",
-                                        "decl_pointer" : 156,
+                                        "decl_pointer" : 158,
                                         "name" : {
                                           "name" : "self",
                                           "qual_name" : [
@@ -5554,7 +5576,7 @@
                                           ]
                                         },
                                         "qual_type" : {
-                                          "type_ptr" : 126,
+                                          "type_ptr" : 128,
                                           "is_const" : true
                                         }
                                       }
@@ -5562,7 +5584,7 @@
                                   ],
                                   "body" : ["CompoundStmt" , [
                                     {
-                                      "pointer" : 198,
+                                      "pointer" : 200,
                                       "source_range" : [
                                         {
                                           "column" : 53
@@ -5576,7 +5598,7 @@
                                     [
                                       ["PseudoObjectExpr" , [
                                         {
-                                          "pointer" : 199,
+                                          "pointer" : 201,
                                           "source_range" : [
                                             {
                                               "line" : 43,
@@ -5590,7 +5612,7 @@
                                         [
                                           ["BinaryOperator" , [
                                             {
-                                              "pointer" : 200,
+                                              "pointer" : 202,
                                               "source_range" : [
                                                 {
                                                   "column" : 5
@@ -5603,7 +5625,7 @@
                                             [
                                               ["ObjCPropertyRefExpr" , [
                                                 {
-                                                  "pointer" : 201,
+                                                  "pointer" : 203,
                                                   "source_range" : [
                                                     {
                                                       "column" : 5
@@ -5616,7 +5638,7 @@
                                                 [
                                                   ["OpaqueValueExpr" , [
                                                     {
-                                                      "pointer" : 202,
+                                                      "pointer" : 204,
                                                       "source_range" : [
                                                         {
                                                           "column" : 5
@@ -5630,13 +5652,13 @@
                                                     ],
                                                     {
                                                       "qual_type" : {
-                                                        "type_ptr" : 126
+                                                        "type_ptr" : 128
                                                       }
                                                     },
                                                     {
                                                       "source_expr" : ["ImplicitCastExpr" , [
                                                         {
-                                                          "pointer" : 203,
+                                                          "pointer" : 205,
                                                           "source_range" : [
                                                             {
                                                               "column" : 5
@@ -5649,7 +5671,7 @@
                                                         [
                                                           ["DeclRefExpr" , [
                                                             {
-                                                              "pointer" : 204,
+                                                              "pointer" : 206,
                                                               "source_range" : [
                                                                 {
                                                                   "column" : 5
@@ -5663,7 +5685,7 @@
                                                             ],
                                                             {
                                                               "qual_type" : {
-                                                                "type_ptr" : 126,
+                                                                "type_ptr" : 128,
                                                                 "is_const" : true
                                                               },
                                                               "value_kind" : "LValue"
@@ -5671,7 +5693,7 @@
                                                             {
                                                               "decl_ref" : {
                                                                 "kind" : "ImplicitParam",
-                                                                "decl_pointer" : 156,
+                                                                "decl_pointer" : 158,
                                                                 "name" : {
                                                                   "name" : "self",
                                                                   "qual_name" : [
@@ -5679,7 +5701,7 @@
                                                                   ]
                                                                 },
                                                                 "qual_type" : {
-                                                                  "type_ptr" : 126,
+                                                                  "type_ptr" : 128,
                                                                   "is_const" : true
                                                                 }
                                                               }
@@ -5688,7 +5710,7 @@
                                                         ],
                                                         {
                                                           "qual_type" : {
-                                                            "type_ptr" : 126
+                                                            "type_ptr" : 128
                                                           }
                                                         },
                                                         {
@@ -5702,7 +5724,7 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 205
+                                                    "type_ptr" : 207
                                                   },
                                                   "value_kind" : "LValue",
                                                   "object_kind" : "ObjCProperty"
@@ -5710,7 +5732,7 @@
                                                 {
                                                   "kind" : ["PropertyRef" , {
                                                     "kind" : "ObjCProperty",
-                                                    "decl_pointer" : 107,
+                                                    "decl_pointer" : 109,
                                                     "name" : {
                                                       "name" : "str",
                                                       "qual_name" : [
@@ -5724,7 +5746,7 @@
                                               ]],
                                               ["OpaqueValueExpr" , [
                                                 {
-                                                  "pointer" : 206,
+                                                  "pointer" : 208,
                                                   "source_range" : [
                                                     {
                                                       "column" : 16
@@ -5745,7 +5767,7 @@
                                                 {
                                                   "source_expr" : ["DeclRefExpr" , [
                                                     {
-                                                      "pointer" : 207,
+                                                      "pointer" : 209,
                                                       "source_range" : [
                                                         {
                                                           "column" : 16
@@ -5766,7 +5788,7 @@
                                                     {
                                                       "decl_ref" : {
                                                         "kind" : "ParmVar",
-                                                        "decl_pointer" : 197,
+                                                        "decl_pointer" : 199,
                                                         "name" : {
                                                           "name" : "x",
                                                           "qual_name" : [
@@ -5794,7 +5816,7 @@
                                           ]],
                                           ["OpaqueValueExpr" , [
                                             {
-                                              "pointer" : 202,
+                                              "pointer" : 204,
                                               "source_range" : [
                                                 {
                                                   "column" : 5
@@ -5808,13 +5830,13 @@
                                             ],
                                             {
                                               "qual_type" : {
-                                                "type_ptr" : 126
+                                                "type_ptr" : 128
                                               }
                                             },
                                             {
                                               "source_expr" : ["ImplicitCastExpr" , [
                                                 {
-                                                  "pointer" : 203,
+                                                  "pointer" : 205,
                                                   "source_range" : [
                                                     {
                                                       "column" : 5
@@ -5827,7 +5849,7 @@
                                                 [
                                                   ["DeclRefExpr" , [
                                                     {
-                                                      "pointer" : 204,
+                                                      "pointer" : 206,
                                                       "source_range" : [
                                                         {
                                                           "column" : 5
@@ -5841,7 +5863,7 @@
                                                     ],
                                                     {
                                                       "qual_type" : {
-                                                        "type_ptr" : 126,
+                                                        "type_ptr" : 128,
                                                         "is_const" : true
                                                       },
                                                       "value_kind" : "LValue"
@@ -5849,7 +5871,7 @@
                                                     {
                                                       "decl_ref" : {
                                                         "kind" : "ImplicitParam",
-                                                        "decl_pointer" : 156,
+                                                        "decl_pointer" : 158,
                                                         "name" : {
                                                           "name" : "self",
                                                           "qual_name" : [
@@ -5857,7 +5879,7 @@
                                                           ]
                                                         },
                                                         "qual_type" : {
-                                                          "type_ptr" : 126,
+                                                          "type_ptr" : 128,
                                                           "is_const" : true
                                                         }
                                                       }
@@ -5866,7 +5888,7 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 126
+                                                    "type_ptr" : 128
                                                   }
                                                 },
                                                 {
@@ -5879,7 +5901,7 @@
                                           ]],
                                           ["OpaqueValueExpr" , [
                                             {
-                                              "pointer" : 206,
+                                              "pointer" : 208,
                                               "source_range" : [
                                                 {
                                                   "column" : 16
@@ -5900,7 +5922,7 @@
                                             {
                                               "source_expr" : ["DeclRefExpr" , [
                                                 {
-                                                  "pointer" : 207,
+                                                  "pointer" : 209,
                                                   "source_range" : [
                                                     {
                                                       "column" : 16
@@ -5921,7 +5943,7 @@
                                                 {
                                                   "decl_ref" : {
                                                     "kind" : "ParmVar",
-                                                    "decl_pointer" : 197,
+                                                    "decl_pointer" : 199,
                                                     "name" : {
                                                       "name" : "x",
                                                       "qual_name" : [
@@ -5938,7 +5960,7 @@
                                           ]],
                                           ["OpaqueValueExpr" , [
                                             {
-                                              "pointer" : 208,
+                                              "pointer" : 210,
                                               "source_range" : [
                                                 {
                                                   "column" : 16
@@ -5958,7 +5980,7 @@
                                             {
                                               "source_expr" : ["ImplicitCastExpr" , [
                                                 {
-                                                  "pointer" : 209,
+                                                  "pointer" : 211,
                                                   "source_range" : [
                                                     {
                                                       "column" : 16
@@ -5971,7 +5993,7 @@
                                                 [
                                                   ["OpaqueValueExpr" , [
                                                     {
-                                                      "pointer" : 206,
+                                                      "pointer" : 208,
                                                       "source_range" : [
                                                         {
                                                           "column" : 16
@@ -5992,7 +6014,7 @@
                                                     {
                                                       "source_expr" : ["DeclRefExpr" , [
                                                         {
-                                                          "pointer" : 207,
+                                                          "pointer" : 209,
                                                           "source_range" : [
                                                             {
                                                               "column" : 16
@@ -6013,7 +6035,7 @@
                                                         {
                                                           "decl_ref" : {
                                                             "kind" : "ParmVar",
-                                                            "decl_pointer" : 197,
+                                                            "decl_pointer" : 199,
                                                             "name" : {
                                                               "name" : "x",
                                                               "qual_name" : [
@@ -6044,7 +6066,7 @@
                                           ]],
                                           ["ObjCMessageExpr" , [
                                             {
-                                              "pointer" : 210,
+                                              "pointer" : 212,
                                               "source_range" : [
                                                 {
                                                   "column" : 10
@@ -6057,7 +6079,7 @@
                                             [
                                               ["OpaqueValueExpr" , [
                                                 {
-                                                  "pointer" : 202,
+                                                  "pointer" : 204,
                                                   "source_range" : [
                                                     {
                                                       "column" : 5
@@ -6071,13 +6093,13 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 126
+                                                    "type_ptr" : 128
                                                   }
                                                 },
                                                 {
                                                   "source_expr" : ["ImplicitCastExpr" , [
                                                     {
-                                                      "pointer" : 203,
+                                                      "pointer" : 205,
                                                       "source_range" : [
                                                         {
                                                           "column" : 5
@@ -6090,7 +6112,7 @@
                                                     [
                                                       ["DeclRefExpr" , [
                                                         {
-                                                          "pointer" : 204,
+                                                          "pointer" : 206,
                                                           "source_range" : [
                                                             {
                                                               "column" : 5
@@ -6104,7 +6126,7 @@
                                                         ],
                                                         {
                                                           "qual_type" : {
-                                                            "type_ptr" : 126,
+                                                            "type_ptr" : 128,
                                                             "is_const" : true
                                                           },
                                                           "value_kind" : "LValue"
@@ -6112,7 +6134,7 @@
                                                         {
                                                           "decl_ref" : {
                                                             "kind" : "ImplicitParam",
-                                                            "decl_pointer" : 156,
+                                                            "decl_pointer" : 158,
                                                             "name" : {
                                                               "name" : "self",
                                                               "qual_name" : [
@@ -6120,7 +6142,7 @@
                                                               ]
                                                             },
                                                             "qual_type" : {
-                                                              "type_ptr" : 126,
+                                                              "type_ptr" : 128,
                                                               "is_const" : true
                                                             }
                                                           }
@@ -6129,7 +6151,7 @@
                                                     ],
                                                     {
                                                       "qual_type" : {
-                                                        "type_ptr" : 126
+                                                        "type_ptr" : 128
                                                       }
                                                     },
                                                     {
@@ -6142,7 +6164,7 @@
                                               ]],
                                               ["OpaqueValueExpr" , [
                                                 {
-                                                  "pointer" : 208,
+                                                  "pointer" : 210,
                                                   "source_range" : [
                                                     {
                                                       "column" : 16
@@ -6162,7 +6184,7 @@
                                                 {
                                                   "source_expr" : ["ImplicitCastExpr" , [
                                                     {
-                                                      "pointer" : 209,
+                                                      "pointer" : 211,
                                                       "source_range" : [
                                                         {
                                                           "column" : 16
@@ -6175,7 +6197,7 @@
                                                     [
                                                       ["OpaqueValueExpr" , [
                                                         {
-                                                          "pointer" : 206,
+                                                          "pointer" : 208,
                                                           "source_range" : [
                                                             {
                                                               "column" : 16
@@ -6196,7 +6218,7 @@
                                                         {
                                                           "source_expr" : ["DeclRefExpr" , [
                                                             {
-                                                              "pointer" : 207,
+                                                              "pointer" : 209,
                                                               "source_range" : [
                                                                 {
                                                                   "column" : 16
@@ -6217,7 +6239,7 @@
                                                             {
                                                               "decl_ref" : {
                                                                 "kind" : "ParmVar",
-                                                                "decl_pointer" : 197,
+                                                                "decl_pointer" : 199,
                                                                 "name" : {
                                                                   "name" : "x",
                                                                   "qual_name" : [
@@ -6249,13 +6271,13 @@
                                             ],
                                             {
                                               "qual_type" : {
-                                                "type_ptr" : 101
+                                                "type_ptr" : 103
                                               }
                                             },
                                             {
                                               "selector" : "setStr:",
                                               "is_definition_found" : true,
-                                              "decl_pointer" : 211
+                                              "decl_pointer" : 213
                                             }
                                           ]]
                                         ],
@@ -6267,7 +6289,7 @@
                                       ]],
                                       ["ReturnStmt" , [
                                         {
-                                          "pointer" : 212,
+                                          "pointer" : 214,
                                           "source_range" : [
                                             {
                                               "line" : 44,
@@ -6281,7 +6303,7 @@
                                         [
                                           ["ObjCMessageExpr" , [
                                             {
-                                              "pointer" : 213,
+                                              "pointer" : 215,
                                               "source_range" : [
                                                 {
                                                   "column" : 12
@@ -6294,7 +6316,7 @@
                                             [
                                               ["ImplicitCastExpr" , [
                                                 {
-                                                  "pointer" : 214,
+                                                  "pointer" : 216,
                                                   "source_range" : [
                                                     {
                                                       "column" : 13
@@ -6307,7 +6329,7 @@
                                                 [
                                                   ["DeclRefExpr" , [
                                                     {
-                                                      "pointer" : 215,
+                                                      "pointer" : 217,
                                                       "source_range" : [
                                                         {
                                                           "column" : 13
@@ -6328,7 +6350,7 @@
                                                     {
                                                       "decl_ref" : {
                                                         "kind" : "ParmVar",
-                                                        "decl_pointer" : 197,
+                                                        "decl_pointer" : 199,
                                                         "name" : {
                                                           "name" : "x",
                                                           "qual_name" : [
@@ -6375,14 +6397,14 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 195
+                              "type_ptr" : 197
                             }
                           },
                           {
                             "decl_refs" : [
                               {
                                 "kind" : "Block",
-                                "decl_pointer" : 196
+                                "decl_pointer" : 198
                               }
                             ]
                           }
@@ -6393,7 +6415,7 @@
                 ]],
                 ["ObjCAtTryStmt" , [
                   {
-                    "pointer" : 218,
+                    "pointer" : 220,
                     "source_range" : [
                       {
                         "line" : 47,
@@ -6408,7 +6430,7 @@
                   [
                     ["CompoundStmt" , [
                       {
-                        "pointer" : 219,
+                        "pointer" : 221,
                         "source_range" : [
                           {
                             "line" : 47,
@@ -6423,7 +6445,7 @@
                       [
                         ["DeclStmt" , [
                           {
-                            "pointer" : 220,
+                            "pointer" : 222,
                             "source_range" : [
                               {
                                 "line" : 48,
@@ -6437,7 +6459,7 @@
                           [
                             ["ExprWithCleanups" , [
                               {
-                                "pointer" : 221,
+                                "pointer" : 223,
                                 "source_range" : [
                                   {
                                     "column" : 18
@@ -6450,7 +6472,7 @@
                               [
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 222,
+                                    "pointer" : 224,
                                     "source_range" : [
                                       {
                                         "column" : 18
@@ -6463,7 +6485,7 @@
                                   [
                                     ["ObjCArrayLiteral" , [
                                       {
-                                        "pointer" : 223,
+                                        "pointer" : 225,
                                         "source_range" : [
                                           {
                                             "column" : 18
@@ -6476,7 +6498,7 @@
                                       [
                                         ["ImplicitCastExpr" , [
                                           {
-                                            "pointer" : 224,
+                                            "pointer" : 226,
                                             "source_range" : [
                                               {
                                                 "column" : 21
@@ -6489,7 +6511,7 @@
                                           [
                                             ["ImplicitCastExpr" , [
                                               {
-                                                "pointer" : 225,
+                                                "pointer" : 227,
                                                 "source_range" : [
                                                   {
                                                     "column" : 21
@@ -6502,7 +6524,7 @@
                                               [
                                                 ["ObjCBoxedExpr" , [
                                                   {
-                                                    "pointer" : 226,
+                                                    "pointer" : 228,
                                                     "source_range" : [
                                                       {
                                                         "column" : 21
@@ -6515,7 +6537,7 @@
                                                   [
                                                     ["IntegerLiteral" , [
                                                       {
-                                                        "pointer" : 227,
+                                                        "pointer" : 229,
                                                         "source_range" : [
                                                           {
                                                             "column" : 22
@@ -6541,7 +6563,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 228
+                                                      "type_ptr" : 230
                                                     }
                                                   },
                                                   {
@@ -6551,7 +6573,7 @@
                                               ],
                                               {
                                                 "qual_type" : {
-                                                  "type_ptr" : 228
+                                                  "type_ptr" : 230
                                                 }
                                               },
                                               {
@@ -6607,7 +6629,7 @@
                           [
                             ["VarDecl" , [
                               {
-                                "pointer" : 229,
+                                "pointer" : 231,
                                 "source_range" : [
                                   {
                                     "column" : 5
@@ -6631,7 +6653,7 @@
                               {
                                 "init_expr" : ["ExprWithCleanups" , [
                                   {
-                                    "pointer" : 221,
+                                    "pointer" : 223,
                                     "source_range" : [
                                       {
                                         "column" : 18
@@ -6644,7 +6666,7 @@
                                   [
                                     ["ImplicitCastExpr" , [
                                       {
-                                        "pointer" : 222,
+                                        "pointer" : 224,
                                         "source_range" : [
                                           {
                                             "column" : 18
@@ -6657,7 +6679,7 @@
                                       [
                                         ["ObjCArrayLiteral" , [
                                           {
-                                            "pointer" : 223,
+                                            "pointer" : 225,
                                             "source_range" : [
                                               {
                                                 "column" : 18
@@ -6670,7 +6692,7 @@
                                           [
                                             ["ImplicitCastExpr" , [
                                               {
-                                                "pointer" : 224,
+                                                "pointer" : 226,
                                                 "source_range" : [
                                                   {
                                                     "column" : 21
@@ -6683,7 +6705,7 @@
                                               [
                                                 ["ImplicitCastExpr" , [
                                                   {
-                                                    "pointer" : 225,
+                                                    "pointer" : 227,
                                                     "source_range" : [
                                                       {
                                                         "column" : 21
@@ -6696,7 +6718,7 @@
                                                   [
                                                     ["ObjCBoxedExpr" , [
                                                       {
-                                                        "pointer" : 226,
+                                                        "pointer" : 228,
                                                         "source_range" : [
                                                           {
                                                             "column" : 21
@@ -6709,7 +6731,7 @@
                                                       [
                                                         ["IntegerLiteral" , [
                                                           {
-                                                            "pointer" : 227,
+                                                            "pointer" : 229,
                                                             "source_range" : [
                                                               {
                                                                 "column" : 22
@@ -6735,7 +6757,7 @@
                                                       ],
                                                       {
                                                         "qual_type" : {
-                                                          "type_ptr" : 228
+                                                          "type_ptr" : 230
                                                         }
                                                       },
                                                       {
@@ -6745,7 +6767,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 228
+                                                      "type_ptr" : 230
                                                     }
                                                   },
                                                   {
@@ -6803,7 +6825,7 @@
                         ]],
                         ["ExprWithCleanups" , [
                           {
-                            "pointer" : 230,
+                            "pointer" : 232,
                             "source_range" : [
                               {
                                 "line" : 49,
@@ -6817,7 +6839,7 @@
                           [
                             ["CallExpr" , [
                               {
-                                "pointer" : 231,
+                                "pointer" : 233,
                                 "source_range" : [
                                   {
                                     "column" : 5
@@ -6830,7 +6852,7 @@
                               [
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 232,
+                                    "pointer" : 234,
                                     "source_range" : [
                                       {
                                         "column" : 5
@@ -6843,7 +6865,7 @@
                                   [
                                     ["DeclRefExpr" , [
                                       {
-                                        "pointer" : 233,
+                                        "pointer" : 235,
                                         "source_range" : [
                                           {
                                             "column" : 5
@@ -6857,13 +6879,13 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 90
+                                          "type_ptr" : 91
                                         }
                                       },
                                       {
                                         "decl_ref" : {
                                           "kind" : "Function",
-                                          "decl_pointer" : 92,
+                                          "decl_pointer" : 93,
                                           "name" : {
                                             "name" : "NSLog",
                                             "qual_name" : [
@@ -6871,7 +6893,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 90
+                                            "type_ptr" : 91
                                           }
                                         }
                                       }
@@ -6879,7 +6901,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 162
+                                      "type_ptr" : 164
                                     }
                                   },
                                   {
@@ -6890,7 +6912,7 @@
                                 ]],
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 234,
+                                    "pointer" : 236,
                                     "source_range" : [
                                       {
                                         "column" : 11
@@ -6903,7 +6925,7 @@
                                   [
                                     ["ObjCStringLiteral" , [
                                       {
-                                        "pointer" : 235,
+                                        "pointer" : 237,
                                         "source_range" : [
                                           {
                                             "column" : 11
@@ -6916,7 +6938,7 @@
                                       [
                                         ["StringLiteral" , [
                                           {
-                                            "pointer" : 236,
+                                            "pointer" : 238,
                                             "source_range" : [
                                               {
                                                 "column" : 12
@@ -6930,7 +6952,7 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 166
+                                              "type_ptr" : 168
                                             },
                                             "value_kind" : "LValue"
                                           },
@@ -6959,7 +6981,7 @@
                                 ]],
                                 ["PseudoObjectExpr" , [
                                   {
-                                    "pointer" : 237,
+                                    "pointer" : 239,
                                     "source_range" : [
                                       {
                                         "column" : 20
@@ -6972,7 +6994,7 @@
                                   [
                                     ["ObjCSubscriptRefExpr" , [
                                       {
-                                        "pointer" : 238,
+                                        "pointer" : 240,
                                         "source_range" : [
                                           {
                                             "column" : 20
@@ -6985,7 +7007,7 @@
                                       [
                                         ["OpaqueValueExpr" , [
                                           {
-                                            "pointer" : 239,
+                                            "pointer" : 241,
                                             "source_range" : [
                                               {
                                                 "column" : 20
@@ -7005,7 +7027,7 @@
                                           {
                                             "source_expr" : ["ImplicitCastExpr" , [
                                               {
-                                                "pointer" : 240,
+                                                "pointer" : 242,
                                                 "source_range" : [
                                                   {
                                                     "column" : 20
@@ -7018,7 +7040,7 @@
                                               [
                                                 ["DeclRefExpr" , [
                                                   {
-                                                    "pointer" : 241,
+                                                    "pointer" : 243,
                                                     "source_range" : [
                                                       {
                                                         "column" : 20
@@ -7039,7 +7061,7 @@
                                                   {
                                                     "decl_ref" : {
                                                       "kind" : "Var",
-                                                      "decl_pointer" : 229,
+                                                      "decl_pointer" : 231,
                                                       "name" : {
                                                         "name" : "a",
                                                         "qual_name" : [
@@ -7068,7 +7090,7 @@
                                         ]],
                                         ["OpaqueValueExpr" , [
                                           {
-                                            "pointer" : 242,
+                                            "pointer" : 244,
                                             "source_range" : [
                                               {
                                                 "column" : 22
@@ -7088,7 +7110,7 @@
                                           {
                                             "source_expr" : ["IntegerLiteral" , [
                                               {
-                                                "pointer" : 243,
+                                                "pointer" : 245,
                                                 "source_range" : [
                                                   {
                                                     "column" : 22
@@ -7116,7 +7138,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 205
+                                          "type_ptr" : 207
                                         },
                                         "value_kind" : "LValue",
                                         "object_kind" : "ObjCSubscript"
@@ -7127,7 +7149,7 @@
                                     ]],
                                     ["OpaqueValueExpr" , [
                                       {
-                                        "pointer" : 239,
+                                        "pointer" : 241,
                                         "source_range" : [
                                           {
                                             "column" : 20
@@ -7147,7 +7169,7 @@
                                       {
                                         "source_expr" : ["ImplicitCastExpr" , [
                                           {
-                                            "pointer" : 240,
+                                            "pointer" : 242,
                                             "source_range" : [
                                               {
                                                 "column" : 20
@@ -7160,7 +7182,7 @@
                                           [
                                             ["DeclRefExpr" , [
                                               {
-                                                "pointer" : 241,
+                                                "pointer" : 243,
                                                 "source_range" : [
                                                   {
                                                     "column" : 20
@@ -7181,7 +7203,7 @@
                                               {
                                                 "decl_ref" : {
                                                   "kind" : "Var",
-                                                  "decl_pointer" : 229,
+                                                  "decl_pointer" : 231,
                                                   "name" : {
                                                     "name" : "a",
                                                     "qual_name" : [
@@ -7210,7 +7232,7 @@
                                     ]],
                                     ["OpaqueValueExpr" , [
                                       {
-                                        "pointer" : 242,
+                                        "pointer" : 244,
                                         "source_range" : [
                                           {
                                             "column" : 22
@@ -7230,7 +7252,7 @@
                                       {
                                         "source_expr" : ["IntegerLiteral" , [
                                           {
-                                            "pointer" : 243,
+                                            "pointer" : 245,
                                             "source_range" : [
                                               {
                                                 "column" : 22
@@ -7257,7 +7279,7 @@
                                     ]],
                                     ["ImplicitCastExpr" , [
                                       {
-                                        "pointer" : 244,
+                                        "pointer" : 246,
                                         "source_range" : [
                                           {
                                             "column" : 20
@@ -7270,7 +7292,7 @@
                                       [
                                         ["ObjCMessageExpr" , [
                                           {
-                                            "pointer" : 245,
+                                            "pointer" : 247,
                                             "source_range" : [
                                               {
                                                 "column" : 20
@@ -7283,7 +7305,7 @@
                                           [
                                             ["OpaqueValueExpr" , [
                                               {
-                                                "pointer" : 239,
+                                                "pointer" : 241,
                                                 "source_range" : [
                                                   {
                                                     "column" : 20
@@ -7303,7 +7325,7 @@
                                               {
                                                 "source_expr" : ["ImplicitCastExpr" , [
                                                   {
-                                                    "pointer" : 240,
+                                                    "pointer" : 242,
                                                     "source_range" : [
                                                       {
                                                         "column" : 20
@@ -7316,7 +7338,7 @@
                                                   [
                                                     ["DeclRefExpr" , [
                                                       {
-                                                        "pointer" : 241,
+                                                        "pointer" : 243,
                                                         "source_range" : [
                                                           {
                                                             "column" : 20
@@ -7337,7 +7359,7 @@
                                                       {
                                                         "decl_ref" : {
                                                           "kind" : "Var",
-                                                          "decl_pointer" : 229,
+                                                          "decl_pointer" : 231,
                                                           "name" : {
                                                             "name" : "a",
                                                             "qual_name" : [
@@ -7366,7 +7388,7 @@
                                             ]],
                                             ["ImplicitCastExpr" , [
                                               {
-                                                "pointer" : 246,
+                                                "pointer" : 248,
                                                 "source_range" : [
                                                   {
                                                     "column" : 22
@@ -7379,7 +7401,7 @@
                                               [
                                                 ["OpaqueValueExpr" , [
                                                   {
-                                                    "pointer" : 242,
+                                                    "pointer" : 244,
                                                     "source_range" : [
                                                       {
                                                         "column" : 22
@@ -7399,7 +7421,7 @@
                                                   {
                                                     "source_expr" : ["IntegerLiteral" , [
                                                       {
-                                                        "pointer" : 243,
+                                                        "pointer" : 245,
                                                         "source_range" : [
                                                           {
                                                             "column" : 22
@@ -7469,14 +7491,14 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 101
+                                  "type_ptr" : 103
                                 }
                               }
                             ]]
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 101
+                              "type_ptr" : 103
                             }
                           },
                           {
@@ -7484,7 +7506,7 @@
                         ]],
                         ["DeclStmt" , [
                           {
-                            "pointer" : 247,
+                            "pointer" : 249,
                             "source_range" : [
                               {
                                 "line" : 51,
@@ -7498,7 +7520,7 @@
                           [
                             ["ExprWithCleanups" , [
                               {
-                                "pointer" : 248,
+                                "pointer" : 250,
                                 "source_range" : [
                                   {
                                     "column" : 23
@@ -7511,7 +7533,7 @@
                               [
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 249,
+                                    "pointer" : 251,
                                     "source_range" : [
                                       {
                                         "column" : 23
@@ -7524,7 +7546,7 @@
                                   [
                                     ["ObjCDictionaryLiteral" , [
                                       {
-                                        "pointer" : 250,
+                                        "pointer" : 252,
                                         "source_range" : [
                                           {
                                             "column" : 23
@@ -7537,7 +7559,7 @@
                                       [
                                         ["ImplicitCastExpr" , [
                                           {
-                                            "pointer" : 251,
+                                            "pointer" : 253,
                                             "source_range" : [
                                               {
                                                 "column" : 25
@@ -7550,7 +7572,7 @@
                                           [
                                             ["ObjCStringLiteral" , [
                                               {
-                                                "pointer" : 252,
+                                                "pointer" : 254,
                                                 "source_range" : [
                                                   {
                                                     "column" : 25
@@ -7563,7 +7585,7 @@
                                               [
                                                 ["StringLiteral" , [
                                                   {
-                                                    "pointer" : 253,
+                                                    "pointer" : 255,
                                                     "source_range" : [
                                                       {
                                                         "column" : 26
@@ -7577,7 +7599,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 166
+                                                      "type_ptr" : 168
                                                     },
                                                     "value_kind" : "LValue"
                                                   },
@@ -7606,7 +7628,7 @@
                                         ]],
                                         ["ImplicitCastExpr" , [
                                           {
-                                            "pointer" : 254,
+                                            "pointer" : 256,
                                             "source_range" : [
                                               {
                                                 "column" : 34
@@ -7619,7 +7641,7 @@
                                           [
                                             ["ImplicitCastExpr" , [
                                               {
-                                                "pointer" : 255,
+                                                "pointer" : 257,
                                                 "source_range" : [
                                                   {
                                                     "column" : 34
@@ -7632,7 +7654,7 @@
                                               [
                                                 ["ObjCBoxedExpr" , [
                                                   {
-                                                    "pointer" : 256,
+                                                    "pointer" : 258,
                                                     "source_range" : [
                                                       {
                                                         "column" : 34
@@ -7645,7 +7667,7 @@
                                                   [
                                                     ["IntegerLiteral" , [
                                                       {
-                                                        "pointer" : 257,
+                                                        "pointer" : 259,
                                                         "source_range" : [
                                                           {
                                                             "column" : 35
@@ -7671,7 +7693,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 228
+                                                      "type_ptr" : 230
                                                     }
                                                   },
                                                   {
@@ -7681,7 +7703,7 @@
                                               ],
                                               {
                                                 "qual_type" : {
-                                                  "type_ptr" : 228
+                                                  "type_ptr" : 230
                                                 }
                                               },
                                               {
@@ -7737,7 +7759,7 @@
                           [
                             ["VarDecl" , [
                               {
-                                "pointer" : 258,
+                                "pointer" : 260,
                                 "source_range" : [
                                   {
                                     "column" : 5
@@ -7761,7 +7783,7 @@
                               {
                                 "init_expr" : ["ExprWithCleanups" , [
                                   {
-                                    "pointer" : 248,
+                                    "pointer" : 250,
                                     "source_range" : [
                                       {
                                         "column" : 23
@@ -7774,7 +7796,7 @@
                                   [
                                     ["ImplicitCastExpr" , [
                                       {
-                                        "pointer" : 249,
+                                        "pointer" : 251,
                                         "source_range" : [
                                           {
                                             "column" : 23
@@ -7787,7 +7809,7 @@
                                       [
                                         ["ObjCDictionaryLiteral" , [
                                           {
-                                            "pointer" : 250,
+                                            "pointer" : 252,
                                             "source_range" : [
                                               {
                                                 "column" : 23
@@ -7800,7 +7822,7 @@
                                           [
                                             ["ImplicitCastExpr" , [
                                               {
-                                                "pointer" : 251,
+                                                "pointer" : 253,
                                                 "source_range" : [
                                                   {
                                                     "column" : 25
@@ -7813,7 +7835,7 @@
                                               [
                                                 ["ObjCStringLiteral" , [
                                                   {
-                                                    "pointer" : 252,
+                                                    "pointer" : 254,
                                                     "source_range" : [
                                                       {
                                                         "column" : 25
@@ -7826,7 +7848,7 @@
                                                   [
                                                     ["StringLiteral" , [
                                                       {
-                                                        "pointer" : 253,
+                                                        "pointer" : 255,
                                                         "source_range" : [
                                                           {
                                                             "column" : 26
@@ -7840,7 +7862,7 @@
                                                       ],
                                                       {
                                                         "qual_type" : {
-                                                          "type_ptr" : 166
+                                                          "type_ptr" : 168
                                                         },
                                                         "value_kind" : "LValue"
                                                       },
@@ -7869,7 +7891,7 @@
                                             ]],
                                             ["ImplicitCastExpr" , [
                                               {
-                                                "pointer" : 254,
+                                                "pointer" : 256,
                                                 "source_range" : [
                                                   {
                                                     "column" : 34
@@ -7882,7 +7904,7 @@
                                               [
                                                 ["ImplicitCastExpr" , [
                                                   {
-                                                    "pointer" : 255,
+                                                    "pointer" : 257,
                                                     "source_range" : [
                                                       {
                                                         "column" : 34
@@ -7895,7 +7917,7 @@
                                                   [
                                                     ["ObjCBoxedExpr" , [
                                                       {
-                                                        "pointer" : 256,
+                                                        "pointer" : 258,
                                                         "source_range" : [
                                                           {
                                                             "column" : 34
@@ -7908,7 +7930,7 @@
                                                       [
                                                         ["IntegerLiteral" , [
                                                           {
-                                                            "pointer" : 257,
+                                                            "pointer" : 259,
                                                             "source_range" : [
                                                               {
                                                                 "column" : 35
@@ -7934,7 +7956,7 @@
                                                       ],
                                                       {
                                                         "qual_type" : {
-                                                          "type_ptr" : 228
+                                                          "type_ptr" : 230
                                                         }
                                                       },
                                                       {
@@ -7944,7 +7966,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 228
+                                                      "type_ptr" : 230
                                                     }
                                                   },
                                                   {
@@ -8002,7 +8024,7 @@
                         ]],
                         ["ExprWithCleanups" , [
                           {
-                            "pointer" : 259,
+                            "pointer" : 261,
                             "source_range" : [
                               {
                                 "line" : 52,
@@ -8016,7 +8038,7 @@
                           [
                             ["CallExpr" , [
                               {
-                                "pointer" : 260,
+                                "pointer" : 262,
                                 "source_range" : [
                                   {
                                     "column" : 5
@@ -8029,7 +8051,7 @@
                               [
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 261,
+                                    "pointer" : 263,
                                     "source_range" : [
                                       {
                                         "column" : 5
@@ -8042,7 +8064,7 @@
                                   [
                                     ["DeclRefExpr" , [
                                       {
-                                        "pointer" : 262,
+                                        "pointer" : 264,
                                         "source_range" : [
                                           {
                                             "column" : 5
@@ -8056,13 +8078,13 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 90
+                                          "type_ptr" : 91
                                         }
                                       },
                                       {
                                         "decl_ref" : {
                                           "kind" : "Function",
-                                          "decl_pointer" : 92,
+                                          "decl_pointer" : 93,
                                           "name" : {
                                             "name" : "NSLog",
                                             "qual_name" : [
@@ -8070,7 +8092,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 90
+                                            "type_ptr" : 91
                                           }
                                         }
                                       }
@@ -8078,7 +8100,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 162
+                                      "type_ptr" : 164
                                     }
                                   },
                                   {
@@ -8089,7 +8111,7 @@
                                 ]],
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 263,
+                                    "pointer" : 265,
                                     "source_range" : [
                                       {
                                         "column" : 11
@@ -8102,7 +8124,7 @@
                                   [
                                     ["ObjCStringLiteral" , [
                                       {
-                                        "pointer" : 264,
+                                        "pointer" : 266,
                                         "source_range" : [
                                           {
                                             "column" : 11
@@ -8115,7 +8137,7 @@
                                       [
                                         ["StringLiteral" , [
                                           {
-                                            "pointer" : 265,
+                                            "pointer" : 267,
                                             "source_range" : [
                                               {
                                                 "column" : 12
@@ -8129,7 +8151,7 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 166
+                                              "type_ptr" : 168
                                             },
                                             "value_kind" : "LValue"
                                           },
@@ -8158,7 +8180,7 @@
                                 ]],
                                 ["PseudoObjectExpr" , [
                                   {
-                                    "pointer" : 266,
+                                    "pointer" : 268,
                                     "source_range" : [
                                       {
                                         "column" : 20
@@ -8171,7 +8193,7 @@
                                   [
                                     ["ObjCSubscriptRefExpr" , [
                                       {
-                                        "pointer" : 267,
+                                        "pointer" : 269,
                                         "source_range" : [
                                           {
                                             "column" : 20
@@ -8184,7 +8206,7 @@
                                       [
                                         ["OpaqueValueExpr" , [
                                           {
-                                            "pointer" : 268,
+                                            "pointer" : 270,
                                             "source_range" : [
                                               {
                                                 "column" : 20
@@ -8204,7 +8226,7 @@
                                           {
                                             "source_expr" : ["ImplicitCastExpr" , [
                                               {
-                                                "pointer" : 269,
+                                                "pointer" : 271,
                                                 "source_range" : [
                                                   {
                                                     "column" : 20
@@ -8217,7 +8239,7 @@
                                               [
                                                 ["DeclRefExpr" , [
                                                   {
-                                                    "pointer" : 270,
+                                                    "pointer" : 272,
                                                     "source_range" : [
                                                       {
                                                         "column" : 20
@@ -8238,7 +8260,7 @@
                                                   {
                                                     "decl_ref" : {
                                                       "kind" : "Var",
-                                                      "decl_pointer" : 258,
+                                                      "decl_pointer" : 260,
                                                       "name" : {
                                                         "name" : "d",
                                                         "qual_name" : [
@@ -8267,7 +8289,7 @@
                                         ]],
                                         ["OpaqueValueExpr" , [
                                           {
-                                            "pointer" : 271,
+                                            "pointer" : 273,
                                             "source_range" : [
                                               {
                                                 "column" : 22
@@ -8287,7 +8309,7 @@
                                           {
                                             "source_expr" : ["ObjCStringLiteral" , [
                                               {
-                                                "pointer" : 272,
+                                                "pointer" : 274,
                                                 "source_range" : [
                                                   {
                                                     "column" : 22
@@ -8300,7 +8322,7 @@
                                               [
                                                 ["StringLiteral" , [
                                                   {
-                                                    "pointer" : 273,
+                                                    "pointer" : 275,
                                                     "source_range" : [
                                                       {
                                                         "column" : 23
@@ -8314,7 +8336,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 274
+                                                      "type_ptr" : 276
                                                     },
                                                     "value_kind" : "LValue"
                                                   },
@@ -8334,7 +8356,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 205
+                                          "type_ptr" : 207
                                         },
                                         "value_kind" : "LValue",
                                         "object_kind" : "ObjCSubscript"
@@ -8345,7 +8367,7 @@
                                     ]],
                                     ["OpaqueValueExpr" , [
                                       {
-                                        "pointer" : 268,
+                                        "pointer" : 270,
                                         "source_range" : [
                                           {
                                             "column" : 20
@@ -8365,7 +8387,7 @@
                                       {
                                         "source_expr" : ["ImplicitCastExpr" , [
                                           {
-                                            "pointer" : 269,
+                                            "pointer" : 271,
                                             "source_range" : [
                                               {
                                                 "column" : 20
@@ -8378,7 +8400,7 @@
                                           [
                                             ["DeclRefExpr" , [
                                               {
-                                                "pointer" : 270,
+                                                "pointer" : 272,
                                                 "source_range" : [
                                                   {
                                                     "column" : 20
@@ -8399,7 +8421,7 @@
                                               {
                                                 "decl_ref" : {
                                                   "kind" : "Var",
-                                                  "decl_pointer" : 258,
+                                                  "decl_pointer" : 260,
                                                   "name" : {
                                                     "name" : "d",
                                                     "qual_name" : [
@@ -8428,7 +8450,7 @@
                                     ]],
                                     ["OpaqueValueExpr" , [
                                       {
-                                        "pointer" : 271,
+                                        "pointer" : 273,
                                         "source_range" : [
                                           {
                                             "column" : 22
@@ -8448,7 +8470,7 @@
                                       {
                                         "source_expr" : ["ObjCStringLiteral" , [
                                           {
-                                            "pointer" : 272,
+                                            "pointer" : 274,
                                             "source_range" : [
                                               {
                                                 "column" : 22
@@ -8461,7 +8483,7 @@
                                           [
                                             ["StringLiteral" , [
                                               {
-                                                "pointer" : 273,
+                                                "pointer" : 275,
                                                 "source_range" : [
                                                   {
                                                     "column" : 23
@@ -8475,7 +8497,7 @@
                                               ],
                                               {
                                                 "qual_type" : {
-                                                  "type_ptr" : 274
+                                                  "type_ptr" : 276
                                                 },
                                                 "value_kind" : "LValue"
                                               },
@@ -8494,7 +8516,7 @@
                                     ]],
                                     ["ImplicitCastExpr" , [
                                       {
-                                        "pointer" : 275,
+                                        "pointer" : 277,
                                         "source_range" : [
                                           {
                                             "column" : 20
@@ -8507,7 +8529,7 @@
                                       [
                                         ["ObjCMessageExpr" , [
                                           {
-                                            "pointer" : 276,
+                                            "pointer" : 278,
                                             "source_range" : [
                                               {
                                                 "column" : 20
@@ -8520,7 +8542,7 @@
                                           [
                                             ["OpaqueValueExpr" , [
                                               {
-                                                "pointer" : 268,
+                                                "pointer" : 270,
                                                 "source_range" : [
                                                   {
                                                     "column" : 20
@@ -8540,7 +8562,7 @@
                                               {
                                                 "source_expr" : ["ImplicitCastExpr" , [
                                                   {
-                                                    "pointer" : 269,
+                                                    "pointer" : 271,
                                                     "source_range" : [
                                                       {
                                                         "column" : 20
@@ -8553,7 +8575,7 @@
                                                   [
                                                     ["DeclRefExpr" , [
                                                       {
-                                                        "pointer" : 270,
+                                                        "pointer" : 272,
                                                         "source_range" : [
                                                           {
                                                             "column" : 20
@@ -8574,7 +8596,7 @@
                                                       {
                                                         "decl_ref" : {
                                                           "kind" : "Var",
-                                                          "decl_pointer" : 258,
+                                                          "decl_pointer" : 260,
                                                           "name" : {
                                                             "name" : "d",
                                                             "qual_name" : [
@@ -8603,7 +8625,7 @@
                                             ]],
                                             ["ImplicitCastExpr" , [
                                               {
-                                                "pointer" : 277,
+                                                "pointer" : 279,
                                                 "source_range" : [
                                                   {
                                                     "column" : 22
@@ -8616,7 +8638,7 @@
                                               [
                                                 ["OpaqueValueExpr" , [
                                                   {
-                                                    "pointer" : 271,
+                                                    "pointer" : 273,
                                                     "source_range" : [
                                                       {
                                                         "column" : 22
@@ -8636,7 +8658,7 @@
                                                   {
                                                     "source_expr" : ["ObjCStringLiteral" , [
                                                       {
-                                                        "pointer" : 272,
+                                                        "pointer" : 274,
                                                         "source_range" : [
                                                           {
                                                             "column" : 22
@@ -8649,7 +8671,7 @@
                                                       [
                                                         ["StringLiteral" , [
                                                           {
-                                                            "pointer" : 273,
+                                                            "pointer" : 275,
                                                             "source_range" : [
                                                               {
                                                                 "column" : 23
@@ -8663,7 +8685,7 @@
                                                           ],
                                                           {
                                                             "qual_type" : {
-                                                              "type_ptr" : 274
+                                                              "type_ptr" : 276
                                                             },
                                                             "value_kind" : "LValue"
                                                           },
@@ -8725,14 +8747,14 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 101
+                                  "type_ptr" : 103
                                 }
                               }
                             ]]
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 101
+                              "type_ptr" : 103
                             }
                           },
                           {
@@ -8742,7 +8764,7 @@
                     ]],
                     ["ObjCAtCatchStmt" , [
                       {
-                        "pointer" : 278,
+                        "pointer" : 280,
                         "source_range" : [
                           {
                             "line" : 53,
@@ -8757,7 +8779,7 @@
                       [
                         ["CompoundStmt" , [
                           {
-                            "pointer" : 279,
+                            "pointer" : 281,
                             "source_range" : [
                               {
                                 "line" : 53,
@@ -8772,7 +8794,7 @@
                           [
                             ["CallExpr" , [
                               {
-                                "pointer" : 280,
+                                "pointer" : 282,
                                 "source_range" : [
                                   {
                                     "line" : 54,
@@ -8786,7 +8808,7 @@
                               [
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 281,
+                                    "pointer" : 283,
                                     "source_range" : [
                                       {
                                         "column" : 5
@@ -8799,7 +8821,7 @@
                                   [
                                     ["DeclRefExpr" , [
                                       {
-                                        "pointer" : 282,
+                                        "pointer" : 284,
                                         "source_range" : [
                                           {
                                             "column" : 5
@@ -8813,13 +8835,13 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 90
+                                          "type_ptr" : 91
                                         }
                                       },
                                       {
                                         "decl_ref" : {
                                           "kind" : "Function",
-                                          "decl_pointer" : 92,
+                                          "decl_pointer" : 93,
                                           "name" : {
                                             "name" : "NSLog",
                                             "qual_name" : [
@@ -8827,7 +8849,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 90
+                                            "type_ptr" : 91
                                           }
                                         }
                                       }
@@ -8835,7 +8857,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 162
+                                      "type_ptr" : 164
                                     }
                                   },
                                   {
@@ -8846,7 +8868,7 @@
                                 ]],
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 283,
+                                    "pointer" : 285,
                                     "source_range" : [
                                       {
                                         "column" : 11
@@ -8859,7 +8881,7 @@
                                   [
                                     ["ObjCStringLiteral" , [
                                       {
-                                        "pointer" : 284,
+                                        "pointer" : 286,
                                         "source_range" : [
                                           {
                                             "column" : 11
@@ -8872,7 +8894,7 @@
                                       [
                                         ["StringLiteral" , [
                                           {
-                                            "pointer" : 285,
+                                            "pointer" : 287,
                                             "source_range" : [
                                               {
                                                 "column" : 12
@@ -8886,7 +8908,7 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 286
+                                              "type_ptr" : 288
                                             },
                                             "value_kind" : "LValue"
                                           },
@@ -8915,7 +8937,7 @@
                                 ]],
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 287,
+                                    "pointer" : 289,
                                     "source_range" : [
                                       {
                                         "column" : 29
@@ -8928,7 +8950,7 @@
                                   [
                                     ["DeclRefExpr" , [
                                       {
-                                        "pointer" : 288,
+                                        "pointer" : 290,
                                         "source_range" : [
                                           {
                                             "column" : 29
@@ -8942,14 +8964,14 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 289
+                                          "type_ptr" : 291
                                         },
                                         "value_kind" : "LValue"
                                       },
                                       {
                                         "decl_ref" : {
                                           "kind" : "Var",
-                                          "decl_pointer" : 290,
+                                          "decl_pointer" : 292,
                                           "name" : {
                                             "name" : "e",
                                             "qual_name" : [
@@ -8957,7 +8979,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 289
+                                            "type_ptr" : 291
                                           }
                                         }
                                       }
@@ -8965,7 +8987,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 289
+                                      "type_ptr" : 291
                                     }
                                   },
                                   {
@@ -8977,7 +8999,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 101
+                                  "type_ptr" : 103
                                 }
                               }
                             ]]
@@ -8986,7 +9008,7 @@
                       ],
                       ["CatchParam" , ["VarDecl" , [
                         {
-                          "pointer" : 290,
+                          "pointer" : 292,
                           "source_range" : [
                             {
                               "line" : 53,
@@ -9006,7 +9028,7 @@
                           ]
                         },
                         {
-                          "type_ptr" : 289
+                          "type_ptr" : 291
                         },
                         {
                         }
@@ -9014,7 +9036,7 @@
                     ]],
                     ["ObjCAtFinallyStmt" , [
                       {
-                        "pointer" : 291,
+                        "pointer" : 293,
                         "source_range" : [
                           {
                             "line" : 55,
@@ -9029,7 +9051,7 @@
                       [
                         ["CompoundStmt" , [
                           {
-                            "pointer" : 292,
+                            "pointer" : 294,
                             "source_range" : [
                               {
                                 "line" : 55,
@@ -9044,7 +9066,7 @@
                           [
                             ["CallExpr" , [
                               {
-                                "pointer" : 293,
+                                "pointer" : 295,
                                 "source_range" : [
                                   {
                                     "line" : 56,
@@ -9058,7 +9080,7 @@
                               [
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 294,
+                                    "pointer" : 296,
                                     "source_range" : [
                                       {
                                         "column" : 5
@@ -9071,7 +9093,7 @@
                                   [
                                     ["DeclRefExpr" , [
                                       {
-                                        "pointer" : 295,
+                                        "pointer" : 297,
                                         "source_range" : [
                                           {
                                             "column" : 5
@@ -9085,13 +9107,13 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 90
+                                          "type_ptr" : 91
                                         }
                                       },
                                       {
                                         "decl_ref" : {
                                           "kind" : "Function",
-                                          "decl_pointer" : 92,
+                                          "decl_pointer" : 93,
                                           "name" : {
                                             "name" : "NSLog",
                                             "qual_name" : [
@@ -9099,7 +9121,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 90
+                                            "type_ptr" : 91
                                           }
                                         }
                                       }
@@ -9107,7 +9129,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 162
+                                      "type_ptr" : 164
                                     }
                                   },
                                   {
@@ -9118,7 +9140,7 @@
                                 ]],
                                 ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 296,
+                                    "pointer" : 298,
                                     "source_range" : [
                                       {
                                         "column" : 11
@@ -9131,7 +9153,7 @@
                                   [
                                     ["ObjCStringLiteral" , [
                                       {
-                                        "pointer" : 297,
+                                        "pointer" : 299,
                                         "source_range" : [
                                           {
                                             "column" : 11
@@ -9144,7 +9166,7 @@
                                       [
                                         ["StringLiteral" , [
                                           {
-                                            "pointer" : 298,
+                                            "pointer" : 300,
                                             "source_range" : [
                                               {
                                                 "column" : 12
@@ -9158,7 +9180,7 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 299
+                                              "type_ptr" : 301
                                             },
                                             "value_kind" : "LValue"
                                           },
@@ -9188,7 +9210,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 101
+                                  "type_ptr" : 103
                                 }
                               }
                             ]]
@@ -9200,7 +9222,7 @@
                 ]],
                 ["GotoStmt" , [
                   {
-                    "pointer" : 300,
+                    "pointer" : 302,
                     "source_range" : [
                       {
                         "line" : 59,
@@ -9215,12 +9237,12 @@
                   ],
                   {
                     "label" : "theend",
-                    "pointer" : 301
+                    "pointer" : 303
                   }
                 ]],
                 ["ReturnStmt" , [
                   {
-                    "pointer" : 302,
+                    "pointer" : 304,
                     "source_range" : [
                       {
                         "line" : 60,
@@ -9236,7 +9258,7 @@
                 ]],
                 ["LabelStmt" , [
                   {
-                    "pointer" : 303,
+                    "pointer" : 305,
                     "source_range" : [
                       {
                         "line" : 61,
@@ -9251,7 +9273,7 @@
                   [
                     ["CallExpr" , [
                       {
-                        "pointer" : 304,
+                        "pointer" : 306,
                         "source_range" : [
                           {
                             "column" : 3
@@ -9264,7 +9286,7 @@
                       [
                         ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 305,
+                            "pointer" : 307,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -9277,7 +9299,7 @@
                           [
                             ["DeclRefExpr" , [
                               {
-                                "pointer" : 306,
+                                "pointer" : 308,
                                 "source_range" : [
                                   {
                                     "column" : 3
@@ -9291,13 +9313,13 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 90
+                                  "type_ptr" : 91
                                 }
                               },
                               {
                                 "decl_ref" : {
                                   "kind" : "Function",
-                                  "decl_pointer" : 92,
+                                  "decl_pointer" : 93,
                                   "name" : {
                                     "name" : "NSLog",
                                     "qual_name" : [
@@ -9305,7 +9327,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 90
+                                    "type_ptr" : 91
                                   }
                                 }
                               }
@@ -9313,7 +9335,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 162
+                              "type_ptr" : 164
                             }
                           },
                           {
@@ -9324,7 +9346,7 @@
                         ]],
                         ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 307,
+                            "pointer" : 309,
                             "source_range" : [
                               {
                                 "column" : 9
@@ -9337,7 +9359,7 @@
                           [
                             ["ObjCStringLiteral" , [
                               {
-                                "pointer" : 308,
+                                "pointer" : 310,
                                 "source_range" : [
                                   {
                                     "column" : 9
@@ -9350,7 +9372,7 @@
                               [
                                 ["StringLiteral" , [
                                   {
-                                    "pointer" : 309,
+                                    "pointer" : 311,
                                     "source_range" : [
                                       {
                                         "column" : 10
@@ -9364,7 +9386,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 310
+                                      "type_ptr" : 312
                                     },
                                     "value_kind" : "LValue"
                                   },
@@ -9394,7 +9416,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       }
                     ]]
@@ -9408,8 +9430,8 @@
         ]],
         ["ObjCIvarDecl" , [
           {
-            "pointer" : 110,
-            "parent_pointer" : 146,
+            "pointer" : 112,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "line" : 18,
@@ -9439,7 +9461,7 @@
         ]],
         ["ObjCPropertyImplDecl" , [
           {
-            "pointer" : 311,
+            "pointer" : 313,
             "source_range" : [
               {
               },
@@ -9452,7 +9474,7 @@
             "implementation" : "Synthesize",
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 107,
+              "decl_pointer" : 109,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -9463,7 +9485,7 @@
             },
             "ivar_decl" : {
               "kind" : "ObjCIvar",
-              "decl_pointer" : 110,
+              "decl_pointer" : 112,
               "name" : {
                 "name" : "_str",
                 "qual_name" : [
@@ -9479,8 +9501,8 @@
         ]],
         ["ObjCIvarDecl" , [
           {
-            "pointer" : 115,
-            "parent_pointer" : 146,
+            "pointer" : 117,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "line" : 20,
@@ -9499,7 +9521,7 @@
             ]
           },
           {
-            "type_ptr" : 112
+            "type_ptr" : 114
           },
           {
           },
@@ -9510,7 +9532,7 @@
         ]],
         ["ObjCPropertyImplDecl" , [
           {
-            "pointer" : 312,
+            "pointer" : 314,
             "source_range" : [
               {
               },
@@ -9523,7 +9545,7 @@
             "implementation" : "Synthesize",
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 111,
+              "decl_pointer" : 113,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -9534,7 +9556,7 @@
             },
             "ivar_decl" : {
               "kind" : "ObjCIvar",
-              "decl_pointer" : 115,
+              "decl_pointer" : 117,
               "name" : {
                 "name" : "_x",
                 "qual_name" : [
@@ -9543,15 +9565,15 @@
                 ]
               },
               "qual_type" : {
-                "type_ptr" : 112
+                "type_ptr" : 114
               }
             }
           }
         ]],
         ["ObjCIvarDecl" , [
           {
-            "pointer" : 119,
-            "parent_pointer" : 146,
+            "pointer" : 121,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "line" : 21,
@@ -9581,7 +9603,7 @@
         ]],
         ["ObjCPropertyImplDecl" , [
           {
-            "pointer" : 313,
+            "pointer" : 315,
             "source_range" : [
               {
               },
@@ -9594,7 +9616,7 @@
             "implementation" : "Synthesize",
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 116,
+              "decl_pointer" : 118,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -9605,7 +9627,7 @@
             },
             "ivar_decl" : {
               "kind" : "ObjCIvar",
-              "decl_pointer" : 119,
+              "decl_pointer" : 121,
               "name" : {
                 "name" : "_y",
                 "qual_name" : [
@@ -9621,8 +9643,8 @@
         ]],
         ["ObjCIvarDecl" , [
           {
-            "pointer" : 124,
-            "parent_pointer" : 146,
+            "pointer" : 126,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "line" : 22,
@@ -9641,7 +9663,7 @@
             ]
           },
           {
-            "type_ptr" : 121
+            "type_ptr" : 123
           },
           {
           },
@@ -9652,7 +9674,7 @@
         ]],
         ["ObjCPropertyImplDecl" , [
           {
-            "pointer" : 314,
+            "pointer" : 316,
             "source_range" : [
               {
               },
@@ -9665,7 +9687,7 @@
             "implementation" : "Synthesize",
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 120,
+              "decl_pointer" : 122,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -9676,7 +9698,7 @@
             },
             "ivar_decl" : {
               "kind" : "ObjCIvar",
-              "decl_pointer" : 124,
+              "decl_pointer" : 126,
               "name" : {
                 "name" : "_delegate",
                 "qual_name" : [
@@ -9685,15 +9707,15 @@
                 ]
               },
               "qual_type" : {
-                "type_ptr" : 121
+                "type_ptr" : 123
               }
             }
           }
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 315,
-            "parent_pointer" : 146,
+            "pointer" : 317,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "line" : 18,
@@ -9720,7 +9742,7 @@
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 107,
+              "decl_pointer" : 109,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -9732,7 +9754,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 125,
+                  "pointer" : 127,
                   "source_range" : [
                     {
                     },
@@ -9748,7 +9770,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -9756,7 +9778,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 127,
+                  "pointer" : 129,
                   "source_range" : [
                     {
                     },
@@ -9783,8 +9805,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 211,
-            "parent_pointer" : 146,
+            "pointer" : 213,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "column" : 38
@@ -9805,12 +9827,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 107,
+              "decl_pointer" : 109,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -9822,7 +9844,7 @@
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 128,
+                  "pointer" : 130,
                   "source_range" : [
                     {
                       "column" : 38
@@ -9849,7 +9871,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 129,
+                  "pointer" : 131,
                   "source_range" : [
                     {
                     },
@@ -9865,7 +9887,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -9873,7 +9895,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 130,
+                  "pointer" : 132,
                   "source_range" : [
                     {
                     },
@@ -9900,8 +9922,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 316,
-            "parent_pointer" : 146,
+            "pointer" : 318,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "line" : 20,
@@ -9923,12 +9945,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 112
+              "type_ptr" : 114
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 111,
+              "decl_pointer" : 113,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -9940,7 +9962,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 131,
+                  "pointer" : 133,
                   "source_range" : [
                     {
                     },
@@ -9956,7 +9978,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -9964,7 +9986,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 132,
+                  "pointer" : 134,
                   "source_range" : [
                     {
                     },
@@ -9991,8 +10013,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 317,
-            "parent_pointer" : 146,
+            "pointer" : 319,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "column" : 36
@@ -10013,12 +10035,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 111,
+              "decl_pointer" : 113,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -10030,7 +10052,7 @@
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 133,
+                  "pointer" : 135,
                   "source_range" : [
                     {
                       "column" : 36
@@ -10047,7 +10069,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 112
+                  "type_ptr" : 114
                 },
                 {
                   "parm_index_in_function" : 0
@@ -10057,7 +10079,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 134,
+                  "pointer" : 136,
                   "source_range" : [
                     {
                     },
@@ -10073,7 +10095,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10081,7 +10103,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 135,
+                  "pointer" : 137,
                   "source_range" : [
                     {
                     },
@@ -10108,8 +10130,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 318,
-            "parent_pointer" : 146,
+            "pointer" : 320,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "line" : 21,
@@ -10136,7 +10158,7 @@
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 116,
+              "decl_pointer" : 118,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -10148,7 +10170,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 136,
+                  "pointer" : 138,
                   "source_range" : [
                     {
                     },
@@ -10164,7 +10186,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10172,7 +10194,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 137,
+                  "pointer" : 139,
                   "source_range" : [
                     {
                     },
@@ -10199,8 +10221,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 319,
-            "parent_pointer" : 146,
+            "pointer" : 321,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "column" : 34
@@ -10221,12 +10243,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 116,
+              "decl_pointer" : 118,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -10238,7 +10260,7 @@
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 138,
+                  "pointer" : 140,
                   "source_range" : [
                     {
                       "column" : 34
@@ -10265,7 +10287,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 139,
+                  "pointer" : 141,
                   "source_range" : [
                     {
                     },
@@ -10281,7 +10303,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10289,7 +10311,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 140,
+                  "pointer" : 142,
                   "source_range" : [
                     {
                     },
@@ -10316,8 +10338,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 320,
-            "parent_pointer" : 146,
+            "pointer" : 322,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "line" : 22,
@@ -10339,12 +10361,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 121
+              "type_ptr" : 123
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 120,
+              "decl_pointer" : 122,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -10356,7 +10378,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 141,
+                  "pointer" : 143,
                   "source_range" : [
                     {
                     },
@@ -10372,7 +10394,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10380,7 +10402,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 142,
+                  "pointer" : 144,
                   "source_range" : [
                     {
                     },
@@ -10407,8 +10429,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 321,
-            "parent_pointer" : 146,
+            "pointer" : 323,
+            "parent_pointer" : 148,
             "source_range" : [
               {
                 "column" : 54
@@ -10429,12 +10451,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : "ObjCProperty",
-              "decl_pointer" : 120,
+              "decl_pointer" : 122,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -10446,7 +10468,7 @@
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 143,
+                  "pointer" : 145,
                   "source_range" : [
                     {
                       "column" : 54
@@ -10463,7 +10485,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 121
+                  "type_ptr" : 123
                 },
                 {
                   "parm_index_in_function" : 0
@@ -10473,7 +10495,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 144,
+                  "pointer" : 146,
                   "source_range" : [
                     {
                     },
@@ -10489,7 +10511,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10497,7 +10519,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 145,
+                  "pointer" : 147,
                   "source_range" : [
                     {
                     },
@@ -10528,7 +10550,7 @@
       {
         "class_interface" : {
           "kind" : "ObjCInterface",
-          "decl_pointer" : 106,
+          "decl_pointer" : 108,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -10540,7 +10562,7 @@
     ]],
     ["ObjCCategoryDecl" , [
       {
-        "pointer" : 147,
+        "pointer" : 149,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -10562,8 +10584,8 @@
       [
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 322,
-            "parent_pointer" : 147,
+            "pointer" : 324,
+            "parent_pointer" : 149,
             "source_range" : [
               {
                 "line" : 69,
@@ -10584,12 +10606,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 323,
+                  "pointer" : 325,
                   "source_range" : [
                     {
                       "column" : 14
@@ -10616,7 +10638,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 324,
+                  "pointer" : 326,
                   "source_range" : [
                     {
                     },
@@ -10632,7 +10654,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10640,7 +10662,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 325,
+                  "pointer" : 327,
                   "source_range" : [
                     {
                     },
@@ -10671,7 +10693,7 @@
       {
         "class_interface" : {
           "kind" : "ObjCInterface",
-          "decl_pointer" : 106,
+          "decl_pointer" : 108,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -10681,7 +10703,7 @@
         },
         "implementation" : {
           "kind" : "ObjCCategoryImpl",
-          "decl_pointer" : 326,
+          "decl_pointer" : 328,
           "name" : {
             "name" : "MyCategory",
             "qual_name" : [
@@ -10693,7 +10715,7 @@
     ]],
     ["ObjCCategoryImplDecl" , [
       {
-        "pointer" : 326,
+        "pointer" : 328,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -10715,8 +10737,8 @@
       [
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 327,
-            "parent_pointer" : 326,
+            "pointer" : 329,
+            "parent_pointer" : 328,
             "source_range" : [
               {
                 "line" : 75,
@@ -10738,12 +10760,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 328,
+                  "pointer" : 330,
                   "source_range" : [
                     {
                       "line" : 75,
@@ -10771,7 +10793,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 329,
+                  "pointer" : 331,
                   "source_range" : [
                     {
                     },
@@ -10789,7 +10811,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10797,7 +10819,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 330,
+                  "pointer" : 332,
                   "source_range" : [
                     {
                     },
@@ -10821,7 +10843,7 @@
             ],
             "body" : ["CompoundStmt" , [
               {
-                "pointer" : 331,
+                "pointer" : 333,
                 "source_range" : [
                   {
                     "column" : 27
@@ -10835,7 +10857,7 @@
               [
                 ["PseudoObjectExpr" , [
                   {
-                    "pointer" : 332,
+                    "pointer" : 334,
                     "source_range" : [
                       {
                         "line" : 76,
@@ -10849,7 +10871,7 @@
                   [
                     ["BinaryOperator" , [
                       {
-                        "pointer" : 333,
+                        "pointer" : 335,
                         "source_range" : [
                           {
                             "column" : 3
@@ -10862,7 +10884,7 @@
                       [
                         ["ObjCPropertyRefExpr" , [
                           {
-                            "pointer" : 334,
+                            "pointer" : 336,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -10875,7 +10897,7 @@
                           [
                             ["OpaqueValueExpr" , [
                               {
-                                "pointer" : 335,
+                                "pointer" : 337,
                                 "source_range" : [
                                   {
                                     "column" : 3
@@ -10889,13 +10911,13 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
                                 "source_expr" : ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 336,
+                                    "pointer" : 338,
                                     "source_range" : [
                                       {
                                         "column" : 3
@@ -10908,7 +10930,7 @@
                                   [
                                     ["DeclRefExpr" , [
                                       {
-                                        "pointer" : 337,
+                                        "pointer" : 339,
                                         "source_range" : [
                                           {
                                             "column" : 3
@@ -10922,7 +10944,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 126,
+                                          "type_ptr" : 128,
                                           "is_const" : true
                                         },
                                         "value_kind" : "LValue"
@@ -10930,7 +10952,7 @@
                                       {
                                         "decl_ref" : {
                                           "kind" : "ImplicitParam",
-                                          "decl_pointer" : 329,
+                                          "decl_pointer" : 331,
                                           "name" : {
                                             "name" : "self",
                                             "qual_name" : [
@@ -10938,7 +10960,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 126,
+                                            "type_ptr" : 128,
                                             "is_const" : true
                                           }
                                         }
@@ -10947,7 +10969,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126
+                                      "type_ptr" : 128
                                     }
                                   },
                                   {
@@ -10961,7 +10983,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 205
+                              "type_ptr" : 207
                             },
                             "value_kind" : "LValue",
                             "object_kind" : "ObjCProperty"
@@ -10969,7 +10991,7 @@
                           {
                             "kind" : ["PropertyRef" , {
                               "kind" : "ObjCProperty",
-                              "decl_pointer" : 111,
+                              "decl_pointer" : 113,
                               "name" : {
                                 "name" : "x",
                                 "qual_name" : [
@@ -10983,7 +11005,7 @@
                         ]],
                         ["OpaqueValueExpr" , [
                           {
-                            "pointer" : 338,
+                            "pointer" : 340,
                             "source_range" : [
                               {
                                 "column" : 12
@@ -10997,13 +11019,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 112
+                              "type_ptr" : 114
                             }
                           },
                           {
                             "source_expr" : ["ParenExpr" , [
                               {
-                                "pointer" : 339,
+                                "pointer" : 341,
                                 "source_range" : [
                                   {
                                     "column" : 12
@@ -11016,7 +11038,7 @@
                               [
                                 ["CStyleCastExpr" , [
                                   {
-                                    "pointer" : 340,
+                                    "pointer" : 342,
                                     "source_range" : [
                                       {
                                         "column" : 12
@@ -11029,7 +11051,7 @@
                                   [
                                     ["IntegerLiteral" , [
                                       {
-                                        "pointer" : 341,
+                                        "pointer" : 343,
                                         "source_range" : [
                                           {
                                             "column" : 12
@@ -11055,7 +11077,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 112
+                                      "type_ptr" : 114
                                     }
                                   },
                                   {
@@ -11064,13 +11086,13 @@
                                     ]
                                   },
                                   {
-                                    "type_ptr" : 112
+                                    "type_ptr" : 114
                                   }
                                 ]]
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 112
+                                  "type_ptr" : 114
                                 }
                               }
                             ]]
@@ -11079,7 +11101,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 112
+                          "type_ptr" : 114
                         }
                       },
                       {
@@ -11088,7 +11110,7 @@
                     ]],
                     ["OpaqueValueExpr" , [
                       {
-                        "pointer" : 335,
+                        "pointer" : 337,
                         "source_range" : [
                           {
                             "column" : 3
@@ -11102,13 +11124,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 126
+                          "type_ptr" : 128
                         }
                       },
                       {
                         "source_expr" : ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 336,
+                            "pointer" : 338,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -11121,7 +11143,7 @@
                           [
                             ["DeclRefExpr" , [
                               {
-                                "pointer" : 337,
+                                "pointer" : 339,
                                 "source_range" : [
                                   {
                                     "column" : 3
@@ -11135,7 +11157,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126,
+                                  "type_ptr" : 128,
                                   "is_const" : true
                                 },
                                 "value_kind" : "LValue"
@@ -11143,7 +11165,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : "ImplicitParam",
-                                  "decl_pointer" : 329,
+                                  "decl_pointer" : 331,
                                   "name" : {
                                     "name" : "self",
                                     "qual_name" : [
@@ -11151,7 +11173,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 126,
+                                    "type_ptr" : 128,
                                     "is_const" : true
                                   }
                                 }
@@ -11160,7 +11182,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
@@ -11173,7 +11195,7 @@
                     ]],
                     ["OpaqueValueExpr" , [
                       {
-                        "pointer" : 338,
+                        "pointer" : 340,
                         "source_range" : [
                           {
                             "column" : 12
@@ -11187,13 +11209,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 112
+                          "type_ptr" : 114
                         }
                       },
                       {
                         "source_expr" : ["ParenExpr" , [
                           {
-                            "pointer" : 339,
+                            "pointer" : 341,
                             "source_range" : [
                               {
                                 "column" : 12
@@ -11206,7 +11228,7 @@
                           [
                             ["CStyleCastExpr" , [
                               {
-                                "pointer" : 340,
+                                "pointer" : 342,
                                 "source_range" : [
                                   {
                                     "column" : 12
@@ -11219,7 +11241,7 @@
                               [
                                 ["IntegerLiteral" , [
                                   {
-                                    "pointer" : 341,
+                                    "pointer" : 343,
                                     "source_range" : [
                                       {
                                         "column" : 12
@@ -11245,7 +11267,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 112
+                                  "type_ptr" : 114
                                 }
                               },
                               {
@@ -11254,13 +11276,13 @@
                                 ]
                               },
                               {
-                                "type_ptr" : 112
+                                "type_ptr" : 114
                               }
                             ]]
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 112
+                              "type_ptr" : 114
                             }
                           }
                         ]]
@@ -11268,7 +11290,7 @@
                     ]],
                     ["ObjCMessageExpr" , [
                       {
-                        "pointer" : 342,
+                        "pointer" : 344,
                         "source_range" : [
                           {
                             "column" : 8
@@ -11281,7 +11303,7 @@
                       [
                         ["OpaqueValueExpr" , [
                           {
-                            "pointer" : 335,
+                            "pointer" : 337,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -11295,13 +11317,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
                             "source_expr" : ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 336,
+                                "pointer" : 338,
                                 "source_range" : [
                                   {
                                     "column" : 3
@@ -11314,7 +11336,7 @@
                               [
                                 ["DeclRefExpr" , [
                                   {
-                                    "pointer" : 337,
+                                    "pointer" : 339,
                                     "source_range" : [
                                       {
                                         "column" : 3
@@ -11328,7 +11350,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126,
+                                      "type_ptr" : 128,
                                       "is_const" : true
                                     },
                                     "value_kind" : "LValue"
@@ -11336,7 +11358,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : "ImplicitParam",
-                                      "decl_pointer" : 329,
+                                      "decl_pointer" : 331,
                                       "name" : {
                                         "name" : "self",
                                         "qual_name" : [
@@ -11344,7 +11366,7 @@
                                         ]
                                       },
                                       "qual_type" : {
-                                        "type_ptr" : 126,
+                                        "type_ptr" : 128,
                                         "is_const" : true
                                       }
                                     }
@@ -11353,7 +11375,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -11366,7 +11388,7 @@
                         ]],
                         ["OpaqueValueExpr" , [
                           {
-                            "pointer" : 338,
+                            "pointer" : 340,
                             "source_range" : [
                               {
                                 "column" : 12
@@ -11380,13 +11402,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 112
+                              "type_ptr" : 114
                             }
                           },
                           {
                             "source_expr" : ["ParenExpr" , [
                               {
-                                "pointer" : 339,
+                                "pointer" : 341,
                                 "source_range" : [
                                   {
                                     "column" : 12
@@ -11399,7 +11421,7 @@
                               [
                                 ["CStyleCastExpr" , [
                                   {
-                                    "pointer" : 340,
+                                    "pointer" : 342,
                                     "source_range" : [
                                       {
                                         "column" : 12
@@ -11412,7 +11434,7 @@
                                   [
                                     ["IntegerLiteral" , [
                                       {
-                                        "pointer" : 341,
+                                        "pointer" : 343,
                                         "source_range" : [
                                           {
                                             "column" : 12
@@ -11438,7 +11460,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 112
+                                      "type_ptr" : 114
                                     }
                                   },
                                   {
@@ -11447,13 +11469,13 @@
                                     ]
                                   },
                                   {
-                                    "type_ptr" : 112
+                                    "type_ptr" : 114
                                   }
                                 ]]
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 112
+                                  "type_ptr" : 114
                                 }
                               }
                             ]]
@@ -11462,25 +11484,25 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       },
                       {
                         "selector" : "setX:",
                         "is_definition_found" : true,
-                        "decl_pointer" : 317
+                        "decl_pointer" : 319
                       }
                     ]]
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 112
+                      "type_ptr" : 114
                     }
                   }
                 ]],
                 ["PseudoObjectExpr" , [
                   {
-                    "pointer" : 343,
+                    "pointer" : 345,
                     "source_range" : [
                       {
                         "line" : 77,
@@ -11494,7 +11516,7 @@
                   [
                     ["BinaryOperator" , [
                       {
-                        "pointer" : 344,
+                        "pointer" : 346,
                         "source_range" : [
                           {
                             "column" : 3
@@ -11507,7 +11529,7 @@
                       [
                         ["ObjCPropertyRefExpr" , [
                           {
-                            "pointer" : 345,
+                            "pointer" : 347,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -11520,7 +11542,7 @@
                           [
                             ["OpaqueValueExpr" , [
                               {
-                                "pointer" : 346,
+                                "pointer" : 348,
                                 "source_range" : [
                                   {
                                     "column" : 3
@@ -11534,13 +11556,13 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
                                 "source_expr" : ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 347,
+                                    "pointer" : 349,
                                     "source_range" : [
                                       {
                                         "column" : 3
@@ -11553,7 +11575,7 @@
                                   [
                                     ["DeclRefExpr" , [
                                       {
-                                        "pointer" : 348,
+                                        "pointer" : 350,
                                         "source_range" : [
                                           {
                                             "column" : 3
@@ -11567,7 +11589,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 126,
+                                          "type_ptr" : 128,
                                           "is_const" : true
                                         },
                                         "value_kind" : "LValue"
@@ -11575,7 +11597,7 @@
                                       {
                                         "decl_ref" : {
                                           "kind" : "ImplicitParam",
-                                          "decl_pointer" : 329,
+                                          "decl_pointer" : 331,
                                           "name" : {
                                             "name" : "self",
                                             "qual_name" : [
@@ -11583,7 +11605,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 126,
+                                            "type_ptr" : 128,
                                             "is_const" : true
                                           }
                                         }
@@ -11592,7 +11614,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126
+                                      "type_ptr" : 128
                                     }
                                   },
                                   {
@@ -11606,7 +11628,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 205
+                              "type_ptr" : 207
                             },
                             "value_kind" : "LValue",
                             "object_kind" : "ObjCProperty"
@@ -11614,7 +11636,7 @@
                           {
                             "kind" : ["PropertyRef" , {
                               "kind" : "ObjCProperty",
-                              "decl_pointer" : 116,
+                              "decl_pointer" : 118,
                               "name" : {
                                 "name" : "y",
                                 "qual_name" : [
@@ -11628,7 +11650,7 @@
                         ]],
                         ["OpaqueValueExpr" , [
                           {
-                            "pointer" : 349,
+                            "pointer" : 351,
                             "source_range" : [
                               {
                                 "column" : 12
@@ -11648,7 +11670,7 @@
                           {
                             "source_expr" : ["IntegerLiteral" , [
                               {
-                                "pointer" : 350,
+                                "pointer" : 352,
                                 "source_range" : [
                                   {
                                     "column" : 12
@@ -11685,7 +11707,7 @@
                     ]],
                     ["OpaqueValueExpr" , [
                       {
-                        "pointer" : 346,
+                        "pointer" : 348,
                         "source_range" : [
                           {
                             "column" : 3
@@ -11699,13 +11721,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 126
+                          "type_ptr" : 128
                         }
                       },
                       {
                         "source_expr" : ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 347,
+                            "pointer" : 349,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -11718,7 +11740,7 @@
                           [
                             ["DeclRefExpr" , [
                               {
-                                "pointer" : 348,
+                                "pointer" : 350,
                                 "source_range" : [
                                   {
                                     "column" : 3
@@ -11732,7 +11754,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126,
+                                  "type_ptr" : 128,
                                   "is_const" : true
                                 },
                                 "value_kind" : "LValue"
@@ -11740,7 +11762,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : "ImplicitParam",
-                                  "decl_pointer" : 329,
+                                  "decl_pointer" : 331,
                                   "name" : {
                                     "name" : "self",
                                     "qual_name" : [
@@ -11748,7 +11770,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 126,
+                                    "type_ptr" : 128,
                                     "is_const" : true
                                   }
                                 }
@@ -11757,7 +11779,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
@@ -11770,7 +11792,7 @@
                     ]],
                     ["OpaqueValueExpr" , [
                       {
-                        "pointer" : 349,
+                        "pointer" : 351,
                         "source_range" : [
                           {
                             "column" : 12
@@ -11790,7 +11812,7 @@
                       {
                         "source_expr" : ["IntegerLiteral" , [
                           {
-                            "pointer" : 350,
+                            "pointer" : 352,
                             "source_range" : [
                               {
                                 "column" : 12
@@ -11817,7 +11839,7 @@
                     ]],
                     ["ObjCMessageExpr" , [
                       {
-                        "pointer" : 351,
+                        "pointer" : 353,
                         "source_range" : [
                           {
                             "column" : 8
@@ -11830,7 +11852,7 @@
                       [
                         ["OpaqueValueExpr" , [
                           {
-                            "pointer" : 346,
+                            "pointer" : 348,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -11844,13 +11866,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
                             "source_expr" : ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 347,
+                                "pointer" : 349,
                                 "source_range" : [
                                   {
                                     "column" : 3
@@ -11863,7 +11885,7 @@
                               [
                                 ["DeclRefExpr" , [
                                   {
-                                    "pointer" : 348,
+                                    "pointer" : 350,
                                     "source_range" : [
                                       {
                                         "column" : 3
@@ -11877,7 +11899,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126,
+                                      "type_ptr" : 128,
                                       "is_const" : true
                                     },
                                     "value_kind" : "LValue"
@@ -11885,7 +11907,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : "ImplicitParam",
-                                      "decl_pointer" : 329,
+                                      "decl_pointer" : 331,
                                       "name" : {
                                         "name" : "self",
                                         "qual_name" : [
@@ -11893,7 +11915,7 @@
                                         ]
                                       },
                                       "qual_type" : {
-                                        "type_ptr" : 126,
+                                        "type_ptr" : 128,
                                         "is_const" : true
                                       }
                                     }
@@ -11902,7 +11924,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -11915,7 +11937,7 @@
                         ]],
                         ["OpaqueValueExpr" , [
                           {
-                            "pointer" : 349,
+                            "pointer" : 351,
                             "source_range" : [
                               {
                                 "column" : 12
@@ -11935,7 +11957,7 @@
                           {
                             "source_expr" : ["IntegerLiteral" , [
                               {
-                                "pointer" : 350,
+                                "pointer" : 352,
                                 "source_range" : [
                                   {
                                     "column" : 12
@@ -11963,13 +11985,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       },
                       {
                         "selector" : "setY:",
                         "is_definition_found" : true,
-                        "decl_pointer" : 319
+                        "decl_pointer" : 321
                       }
                     ]]
                   ],
@@ -11981,7 +12003,7 @@
                 ]],
                 ["PseudoObjectExpr" , [
                   {
-                    "pointer" : 352,
+                    "pointer" : 354,
                     "source_range" : [
                       {
                         "line" : 78,
@@ -11995,7 +12017,7 @@
                   [
                     ["BinaryOperator" , [
                       {
-                        "pointer" : 353,
+                        "pointer" : 355,
                         "source_range" : [
                           {
                             "column" : 3
@@ -12008,7 +12030,7 @@
                       [
                         ["ObjCPropertyRefExpr" , [
                           {
-                            "pointer" : 354,
+                            "pointer" : 356,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -12021,7 +12043,7 @@
                           [
                             ["OpaqueValueExpr" , [
                               {
-                                "pointer" : 355,
+                                "pointer" : 357,
                                 "source_range" : [
                                   {
                                     "column" : 3
@@ -12035,13 +12057,13 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
                                 "source_expr" : ["ImplicitCastExpr" , [
                                   {
-                                    "pointer" : 356,
+                                    "pointer" : 358,
                                     "source_range" : [
                                       {
                                         "column" : 3
@@ -12054,7 +12076,7 @@
                                   [
                                     ["DeclRefExpr" , [
                                       {
-                                        "pointer" : 357,
+                                        "pointer" : 359,
                                         "source_range" : [
                                           {
                                             "column" : 3
@@ -12068,7 +12090,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 126,
+                                          "type_ptr" : 128,
                                           "is_const" : true
                                         },
                                         "value_kind" : "LValue"
@@ -12076,7 +12098,7 @@
                                       {
                                         "decl_ref" : {
                                           "kind" : "ImplicitParam",
-                                          "decl_pointer" : 329,
+                                          "decl_pointer" : 331,
                                           "name" : {
                                             "name" : "self",
                                             "qual_name" : [
@@ -12084,7 +12106,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 126,
+                                            "type_ptr" : 128,
                                             "is_const" : true
                                           }
                                         }
@@ -12093,7 +12115,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126
+                                      "type_ptr" : 128
                                     }
                                   },
                                   {
@@ -12107,7 +12129,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 205
+                              "type_ptr" : 207
                             },
                             "value_kind" : "LValue",
                             "object_kind" : "ObjCProperty"
@@ -12115,7 +12137,7 @@
                           {
                             "kind" : ["PropertyRef" , {
                               "kind" : "ObjCProperty",
-                              "decl_pointer" : 120,
+                              "decl_pointer" : 122,
                               "name" : {
                                 "name" : "delegate",
                                 "qual_name" : [
@@ -12129,7 +12151,7 @@
                         ]],
                         ["OpaqueValueExpr" , [
                           {
-                            "pointer" : 358,
+                            "pointer" : 360,
                             "source_range" : [
                               {
                                 "column" : 19
@@ -12149,7 +12171,7 @@
                           {
                             "source_expr" : ["ParenExpr" , [
                               {
-                                "pointer" : 359,
+                                "pointer" : 361,
                                 "source_range" : [
                                   {
                                     "column" : 19
@@ -12162,7 +12184,7 @@
                               [
                                 ["CStyleCastExpr" , [
                                   {
-                                    "pointer" : 360,
+                                    "pointer" : 362,
                                     "source_range" : [
                                       {
                                         "column" : 19
@@ -12175,7 +12197,7 @@
                                   [
                                     ["IntegerLiteral" , [
                                       {
-                                        "pointer" : 361,
+                                        "pointer" : 363,
                                         "source_range" : [
                                           {
                                             "column" : 19
@@ -12234,7 +12256,7 @@
                     ]],
                     ["OpaqueValueExpr" , [
                       {
-                        "pointer" : 355,
+                        "pointer" : 357,
                         "source_range" : [
                           {
                             "column" : 3
@@ -12248,13 +12270,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 126
+                          "type_ptr" : 128
                         }
                       },
                       {
                         "source_expr" : ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 356,
+                            "pointer" : 358,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -12267,7 +12289,7 @@
                           [
                             ["DeclRefExpr" , [
                               {
-                                "pointer" : 357,
+                                "pointer" : 359,
                                 "source_range" : [
                                   {
                                     "column" : 3
@@ -12281,7 +12303,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126,
+                                  "type_ptr" : 128,
                                   "is_const" : true
                                 },
                                 "value_kind" : "LValue"
@@ -12289,7 +12311,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : "ImplicitParam",
-                                  "decl_pointer" : 329,
+                                  "decl_pointer" : 331,
                                   "name" : {
                                     "name" : "self",
                                     "qual_name" : [
@@ -12297,7 +12319,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 126,
+                                    "type_ptr" : 128,
                                     "is_const" : true
                                   }
                                 }
@@ -12306,7 +12328,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
@@ -12319,7 +12341,7 @@
                     ]],
                     ["OpaqueValueExpr" , [
                       {
-                        "pointer" : 358,
+                        "pointer" : 360,
                         "source_range" : [
                           {
                             "column" : 19
@@ -12339,7 +12361,7 @@
                       {
                         "source_expr" : ["ParenExpr" , [
                           {
-                            "pointer" : 359,
+                            "pointer" : 361,
                             "source_range" : [
                               {
                                 "column" : 19
@@ -12352,7 +12374,7 @@
                           [
                             ["CStyleCastExpr" , [
                               {
-                                "pointer" : 360,
+                                "pointer" : 362,
                                 "source_range" : [
                                   {
                                     "column" : 19
@@ -12365,7 +12387,7 @@
                               [
                                 ["IntegerLiteral" , [
                                   {
-                                    "pointer" : 361,
+                                    "pointer" : 363,
                                     "source_range" : [
                                       {
                                         "column" : 19
@@ -12414,7 +12436,7 @@
                     ]],
                     ["OpaqueValueExpr" , [
                       {
-                        "pointer" : 362,
+                        "pointer" : 364,
                         "source_range" : [
                           {
                             "column" : 19
@@ -12428,13 +12450,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 121
+                          "type_ptr" : 123
                         }
                       },
                       {
                         "source_expr" : ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 363,
+                            "pointer" : 365,
                             "source_range" : [
                               {
                                 "column" : 19
@@ -12447,7 +12469,7 @@
                           [
                             ["OpaqueValueExpr" , [
                               {
-                                "pointer" : 358,
+                                "pointer" : 360,
                                 "source_range" : [
                                   {
                                     "column" : 19
@@ -12467,7 +12489,7 @@
                               {
                                 "source_expr" : ["ParenExpr" , [
                                   {
-                                    "pointer" : 359,
+                                    "pointer" : 361,
                                     "source_range" : [
                                       {
                                         "column" : 19
@@ -12480,7 +12502,7 @@
                                   [
                                     ["CStyleCastExpr" , [
                                       {
-                                        "pointer" : 360,
+                                        "pointer" : 362,
                                         "source_range" : [
                                           {
                                             "column" : 19
@@ -12493,7 +12515,7 @@
                                       [
                                         ["IntegerLiteral" , [
                                           {
-                                            "pointer" : 361,
+                                            "pointer" : 363,
                                             "source_range" : [
                                               {
                                                 "column" : 19
@@ -12543,7 +12565,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 121
+                              "type_ptr" : 123
                             }
                           },
                           {
@@ -12556,7 +12578,7 @@
                     ]],
                     ["ObjCMessageExpr" , [
                       {
-                        "pointer" : 364,
+                        "pointer" : 366,
                         "source_range" : [
                           {
                             "column" : 8
@@ -12569,7 +12591,7 @@
                       [
                         ["OpaqueValueExpr" , [
                           {
-                            "pointer" : 355,
+                            "pointer" : 357,
                             "source_range" : [
                               {
                                 "column" : 3
@@ -12583,13 +12605,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
                             "source_expr" : ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 356,
+                                "pointer" : 358,
                                 "source_range" : [
                                   {
                                     "column" : 3
@@ -12602,7 +12624,7 @@
                               [
                                 ["DeclRefExpr" , [
                                   {
-                                    "pointer" : 357,
+                                    "pointer" : 359,
                                     "source_range" : [
                                       {
                                         "column" : 3
@@ -12616,7 +12638,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126,
+                                      "type_ptr" : 128,
                                       "is_const" : true
                                     },
                                     "value_kind" : "LValue"
@@ -12624,7 +12646,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : "ImplicitParam",
-                                      "decl_pointer" : 329,
+                                      "decl_pointer" : 331,
                                       "name" : {
                                         "name" : "self",
                                         "qual_name" : [
@@ -12632,7 +12654,7 @@
                                         ]
                                       },
                                       "qual_type" : {
-                                        "type_ptr" : 126,
+                                        "type_ptr" : 128,
                                         "is_const" : true
                                       }
                                     }
@@ -12641,7 +12663,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -12654,7 +12676,7 @@
                         ]],
                         ["OpaqueValueExpr" , [
                           {
-                            "pointer" : 362,
+                            "pointer" : 364,
                             "source_range" : [
                               {
                                 "column" : 19
@@ -12668,13 +12690,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 121
+                              "type_ptr" : 123
                             }
                           },
                           {
                             "source_expr" : ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 363,
+                                "pointer" : 365,
                                 "source_range" : [
                                   {
                                     "column" : 19
@@ -12687,7 +12709,7 @@
                               [
                                 ["OpaqueValueExpr" , [
                                   {
-                                    "pointer" : 358,
+                                    "pointer" : 360,
                                     "source_range" : [
                                       {
                                         "column" : 19
@@ -12707,7 +12729,7 @@
                                   {
                                     "source_expr" : ["ParenExpr" , [
                                       {
-                                        "pointer" : 359,
+                                        "pointer" : 361,
                                         "source_range" : [
                                           {
                                             "column" : 19
@@ -12720,7 +12742,7 @@
                                       [
                                         ["CStyleCastExpr" , [
                                           {
-                                            "pointer" : 360,
+                                            "pointer" : 362,
                                             "source_range" : [
                                               {
                                                 "column" : 19
@@ -12733,7 +12755,7 @@
                                           [
                                             ["IntegerLiteral" , [
                                               {
-                                                "pointer" : 361,
+                                                "pointer" : 363,
                                                 "source_range" : [
                                                   {
                                                     "column" : 19
@@ -12783,7 +12805,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 121
+                                  "type_ptr" : 123
                                 }
                               },
                               {
@@ -12797,19 +12819,19 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       },
                       {
                         "selector" : "setDelegate:",
                         "is_definition_found" : true,
-                        "decl_pointer" : 321
+                        "decl_pointer" : 323
                       }
                     ]]
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 121
+                      "type_ptr" : 123
                     }
                   }
                 ]]
@@ -12824,7 +12846,7 @@
       {
         "class_interface" : {
           "kind" : "ObjCInterface",
-          "decl_pointer" : 106,
+          "decl_pointer" : 108,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -12834,7 +12856,7 @@
         },
         "category_decl" : {
           "kind" : "ObjCCategory",
-          "decl_pointer" : 147,
+          "decl_pointer" : 149,
           "name" : {
             "name" : "MyCategory",
             "qual_name" : [
@@ -12846,7 +12868,7 @@
     ]],
     ["ObjCInterfaceDecl" , [
       {
-        "pointer" : 365,
+        "pointer" : 367,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -12884,7 +12906,7 @@
     ]],
     ["ObjCInterfaceDecl" , [
       {
-        "pointer" : 366,
+        "pointer" : 368,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -12906,8 +12928,8 @@
       [
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 367,
-            "parent_pointer" : 366,
+            "pointer" : 369,
+            "parent_pointer" : 368,
             "source_range" : [
               {
                 "line" : 88,
@@ -12920,7 +12942,7 @@
             "attributes" : [
               ["NSReturnsRetainedAttr" , [
                 {
-                  "pointer" : 368,
+                  "pointer" : 370,
                   "source_range" : [
                     {
                     },
@@ -12945,7 +12967,7 @@
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 369,
+                  "pointer" : 371,
                   "source_range" : [
                     {
                       "column" : 28
@@ -12962,7 +12984,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 370
+                  "type_ptr" : 372
                 },
                 {
                   "parm_index_in_function" : 0
@@ -12972,7 +12994,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 371,
+                  "pointer" : 373,
                   "source_range" : [
                     {
                     },
@@ -12996,7 +13018,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 372,
+                  "pointer" : 374,
                   "source_range" : [
                     {
                     },
@@ -13039,7 +13061,7 @@
     ]],
     ["ObjCInterfaceDecl" , [
       {
-        "pointer" : 373,
+        "pointer" : 375,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -13065,7 +13087,7 @@
       {
         "super" : {
           "kind" : "ObjCInterface",
-          "decl_pointer" : 106,
+          "decl_pointer" : 108,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -13075,7 +13097,7 @@
         },
         "implementation" : {
           "kind" : "ObjCImplementation",
-          "decl_pointer" : 374,
+          "decl_pointer" : 376,
           "name" : {
             "name" : "MySubclass",
             "qual_name" : [
@@ -13087,7 +13109,7 @@
     ]],
     ["ObjCImplementationDecl" , [
       {
-        "pointer" : 374,
+        "pointer" : 376,
         "parent_pointer" : 1,
         "source_range" : [
           {
@@ -13109,8 +13131,8 @@
       [
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 375,
-            "parent_pointer" : 374,
+            "pointer" : 377,
+            "parent_pointer" : 376,
             "source_range" : [
               {
                 "line" : 96,
@@ -13132,12 +13154,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 376,
+                  "pointer" : 378,
                   "source_range" : [
                     {
                       "line" : 96,
@@ -13167,7 +13189,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 377,
+                  "pointer" : 379,
                   "source_range" : [
                     {
                     },
@@ -13183,7 +13205,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 378,
+                  "type_ptr" : 380,
                   "is_const" : true
                 },
                 {
@@ -13191,7 +13213,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 379,
+                  "pointer" : 381,
                   "source_range" : [
                     {
                     },
@@ -13216,7 +13238,7 @@
             "is_overriding" : true,
             "body" : ["CompoundStmt" , [
               {
-                "pointer" : 380,
+                "pointer" : 382,
                 "source_range" : [
                   {
                     "column" : 27
@@ -13230,7 +13252,7 @@
               [
                 ["ObjCMessageExpr" , [
                   {
-                    "pointer" : 381,
+                    "pointer" : 383,
                     "source_range" : [
                       {
                         "line" : 97,
@@ -13244,7 +13266,7 @@
                   [
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 382,
+                        "pointer" : 384,
                         "source_range" : [
                           {
                             "column" : 14
@@ -13257,7 +13279,7 @@
                       [
                         ["DeclRefExpr" , [
                           {
-                            "pointer" : 383,
+                            "pointer" : 385,
                             "source_range" : [
                               {
                                 "column" : 14
@@ -13278,7 +13300,7 @@
                           {
                             "decl_ref" : {
                               "kind" : "ParmVar",
-                              "decl_pointer" : 376,
+                              "decl_pointer" : 378,
                               "name" : {
                                 "name" : "s",
                                 "qual_name" : [
@@ -13306,13 +13328,13 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 101
+                      "type_ptr" : 103
                     }
                   },
                   {
                     "selector" : "bar:",
                     "is_definition_found" : true,
-                    "decl_pointer" : 327,
+                    "decl_pointer" : 329,
                     "receiver_kind" : "SuperInstance"
                   }
                 ]]
@@ -13323,8 +13345,8 @@
         ]],
         ["ObjCMethodDecl" , [
           {
-            "pointer" : 384,
-            "parent_pointer" : 374,
+            "pointer" : 386,
+            "parent_pointer" : 376,
             "source_range" : [
               {
                 "line" : 100,
@@ -13346,12 +13368,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               ["ParmVarDecl" , [
                 {
-                  "pointer" : 385,
+                  "pointer" : 387,
                   "source_range" : [
                     {
                       "line" : 100,
@@ -13371,7 +13393,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 151
+                  "type_ptr" : 153
                 },
                 {
                   "parm_index_in_function" : 0
@@ -13381,7 +13403,7 @@
             "implicit_parameters" : [
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 386,
+                  "pointer" : 388,
                   "source_range" : [
                     {
                     },
@@ -13397,7 +13419,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 378,
+                  "type_ptr" : 380,
                   "is_const" : true
                 },
                 {
@@ -13405,7 +13427,7 @@
               ]],
               ["ImplicitParamDecl" , [
                 {
-                  "pointer" : 387,
+                  "pointer" : 389,
                   "source_range" : [
                     {
                     },
@@ -13430,7 +13452,7 @@
             "is_overriding" : true,
             "body" : ["CompoundStmt" , [
               {
-                "pointer" : 388,
+                "pointer" : 390,
                 "source_range" : [
                   {
                     "column" : 36
@@ -13444,7 +13466,7 @@
               [
                 ["ObjCMessageExpr" , [
                   {
-                    "pointer" : 389,
+                    "pointer" : 391,
                     "source_range" : [
                       {
                         "line" : 101,
@@ -13458,7 +13480,7 @@
                   [
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 390,
+                        "pointer" : 392,
                         "source_range" : [
                           {
                             "column" : 14
@@ -13471,7 +13493,7 @@
                       [
                         ["DeclRefExpr" , [
                           {
-                            "pointer" : 391,
+                            "pointer" : 393,
                             "source_range" : [
                               {
                                 "column" : 14
@@ -13485,14 +13507,14 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 151
+                              "type_ptr" : 153
                             },
                             "value_kind" : "LValue"
                           },
                           {
                             "decl_ref" : {
                               "kind" : "ParmVar",
-                              "decl_pointer" : 385,
+                              "decl_pointer" : 387,
                               "name" : {
                                 "name" : "s",
                                 "qual_name" : [
@@ -13500,7 +13522,7 @@
                                 ]
                               },
                               "qual_type" : {
-                                "type_ptr" : 151
+                                "type_ptr" : 153
                               }
                             }
                           }
@@ -13508,7 +13530,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 151
+                          "type_ptr" : 153
                         }
                       },
                       {
@@ -13520,13 +13542,13 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 101
+                      "type_ptr" : 103
                     }
                   },
                   {
                     "selector" : "foo:",
                     "is_definition_found" : true,
-                    "decl_pointer" : 154,
+                    "decl_pointer" : 156,
                     "receiver_kind" : "SuperInstance"
                   }
                 ]]
@@ -13541,7 +13563,7 @@
       {
         "class_interface" : {
           "kind" : "ObjCInterface",
-          "decl_pointer" : 373,
+          "decl_pointer" : 375,
           "name" : {
             "name" : "MySubclass",
             "qual_name" : [
@@ -13553,7 +13575,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 392,
+        "pointer" : 394,
         "source_range" : [
           {
             "line" : 106,
@@ -13572,13 +13594,13 @@
         ]
       },
       {
-        "type_ptr" : 393
+        "type_ptr" : 395
       },
       {
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 394,
+              "pointer" : 396,
               "source_range" : [
                 {
                   "line" : 106,
@@ -13604,7 +13626,7 @@
           ]],
           ["ParmVarDecl" , [
             {
-              "pointer" : 395,
+              "pointer" : 397,
               "source_range" : [
                 {
                   "column" : 20
@@ -13621,17 +13643,17 @@
               ]
             },
             {
-              "type_ptr" : 396
+              "type_ptr" : 398
             },
             {
               "parm_index_in_function" : 1
             }
           ]]
         ],
-        "decl_ptr_with_body" : 392,
+        "decl_ptr_with_body" : 394,
         "body" : ["CompoundStmt" , [
           {
-            "pointer" : 397,
+            "pointer" : 399,
             "source_range" : [
               {
                 "column" : 33
@@ -13645,7 +13667,7 @@
           [
             ["ObjCAutoreleasePoolStmt" , [
               {
-                "pointer" : 398,
+                "pointer" : 400,
                 "source_range" : [
                   {
                     "line" : 107,
@@ -13660,7 +13682,7 @@
               [
                 ["CompoundStmt" , [
                   {
-                    "pointer" : 399,
+                    "pointer" : 401,
                     "source_range" : [
                       {
                         "line" : 107,
@@ -13675,7 +13697,7 @@
                   [
                     ["ExprWithCleanups" , [
                       {
-                        "pointer" : 400,
+                        "pointer" : 402,
                         "source_range" : [
                           {
                             "line" : 108,
@@ -13689,7 +13711,7 @@
                       [
                         ["ObjCMessageExpr" , [
                           {
-                            "pointer" : 401,
+                            "pointer" : 403,
                             "source_range" : [
                               {
                                 "column" : 5
@@ -13702,7 +13724,7 @@
                           [
                             ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 402,
+                                "pointer" : 404,
                                 "source_range" : [
                                   {
                                     "column" : 6
@@ -13715,7 +13737,7 @@
                               [
                                 ["ObjCMessageExpr" , [
                                   {
-                                    "pointer" : 403,
+                                    "pointer" : 405,
                                     "source_range" : [
                                       {
                                         "column" : 6
@@ -13728,7 +13750,7 @@
                                   [
                                     ["ImplicitCastExpr" , [
                                       {
-                                        "pointer" : 404,
+                                        "pointer" : 406,
                                         "source_range" : [
                                           {
                                             "column" : 7
@@ -13741,7 +13763,7 @@
                                       [
                                         ["ObjCMessageExpr" , [
                                           {
-                                            "pointer" : 405,
+                                            "pointer" : 407,
                                             "source_range" : [
                                               {
                                                 "column" : 7
@@ -13755,21 +13777,21 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 126
+                                              "type_ptr" : 128
                                             }
                                           },
                                           {
                                             "selector" : "alloc",
                                             "decl_pointer" : 19,
                                             "receiver_kind" : ["Class" , {
-                                              "type_ptr" : 406
+                                              "type_ptr" : 408
                                             }]
                                           }
                                         ]]
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 126
+                                          "type_ptr" : 128
                                         }
                                       },
                                       {
@@ -13781,7 +13803,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126
+                                      "type_ptr" : 128
                                     }
                                   },
                                   {
@@ -13792,7 +13814,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -13803,7 +13825,7 @@
                             ]],
                             ["ObjCStringLiteral" , [
                               {
-                                "pointer" : 407,
+                                "pointer" : 409,
                                 "source_range" : [
                                   {
                                     "column" : 33
@@ -13816,7 +13838,7 @@
                               [
                                 ["StringLiteral" , [
                                   {
-                                    "pointer" : 408,
+                                    "pointer" : 410,
                                     "source_range" : [
                                       {
                                         "column" : 34
@@ -13830,7 +13852,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 409
+                                      "type_ptr" : 411
                                     },
                                     "value_kind" : "LValue"
                                   },
@@ -13848,19 +13870,19 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 101
+                              "type_ptr" : 103
                             }
                           },
                           {
                             "selector" : "foo:",
                             "is_definition_found" : true,
-                            "decl_pointer" : 154
+                            "decl_pointer" : 156
                           }
                         ]]
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       },
                       {
@@ -13868,7 +13890,7 @@
                     ]],
                     ["ExprWithCleanups" , [
                       {
-                        "pointer" : 410,
+                        "pointer" : 412,
                         "source_range" : [
                           {
                             "line" : 109,
@@ -13882,7 +13904,7 @@
                       [
                         ["ObjCMessageExpr" , [
                           {
-                            "pointer" : 411,
+                            "pointer" : 413,
                             "source_range" : [
                               {
                                 "column" : 5
@@ -13895,7 +13917,7 @@
                           [
                             ["ImplicitCastExpr" , [
                               {
-                                "pointer" : 412,
+                                "pointer" : 414,
                                 "source_range" : [
                                   {
                                     "column" : 6
@@ -13908,7 +13930,7 @@
                               [
                                 ["ObjCMessageExpr" , [
                                   {
-                                    "pointer" : 413,
+                                    "pointer" : 415,
                                     "source_range" : [
                                       {
                                         "column" : 6
@@ -13922,21 +13944,21 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126
+                                      "type_ptr" : 128
                                     }
                                   },
                                   {
                                     "selector" : "new",
                                     "decl_pointer" : 24,
                                     "receiver_kind" : ["Class" , {
-                                      "type_ptr" : 406
+                                      "type_ptr" : 408
                                     }]
                                   }
                                 ]]
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -13947,7 +13969,7 @@
                             ]],
                             ["ObjCStringLiteral" , [
                               {
-                                "pointer" : 414,
+                                "pointer" : 416,
                                 "source_range" : [
                                   {
                                     "column" : 24
@@ -13960,7 +13982,7 @@
                               [
                                 ["StringLiteral" , [
                                   {
-                                    "pointer" : 415,
+                                    "pointer" : 417,
                                     "source_range" : [
                                       {
                                         "column" : 25
@@ -13974,7 +13996,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 409
+                                      "type_ptr" : 411
                                     },
                                     "value_kind" : "LValue"
                                   },
@@ -13992,19 +14014,19 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 101
+                              "type_ptr" : 103
                             }
                           },
                           {
                             "selector" : "bar:",
                             "is_definition_found" : true,
-                            "decl_pointer" : 327
+                            "decl_pointer" : 329
                           }
                         ]]
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       },
                       {
@@ -14016,7 +14038,7 @@
             ]],
             ["ReturnStmt" , [
               {
-                "pointer" : 416,
+                "pointer" : 418,
                 "source_range" : [
                   {
                     "line" : 111,
@@ -14030,7 +14052,7 @@
               [
                 ["IntegerLiteral" , [
                   {
-                    "pointer" : 417,
+                    "pointer" : 419,
                     "source_range" : [
                       {
                         "column" : 10
@@ -14061,7 +14083,7 @@
     ]],
     ["TypedefDecl" , [
       {
-        "pointer" : 418,
+        "pointer" : 420,
         "source_range" : [
           {
           },
@@ -14097,31 +14119,31 @@
     "types" : [
       ["BuiltinType" , [
         {
-          "pointer" : 101
+          "pointer" : 103
         },
         "Void"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 419
+          "pointer" : 421
         },
         "Bool"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 420
+          "pointer" : 422
         },
         "Char_S"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 421
+          "pointer" : 423
         },
         "SChar"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 422
+          "pointer" : 424
         },
         "Short"
       ]],
@@ -14133,25 +14155,25 @@
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 423
+          "pointer" : 425
         },
         "Long"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 424
+          "pointer" : 426
         },
         "LongLong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 425
+          "pointer" : 427
         },
         "UChar"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 426
+          "pointer" : 428
         },
         "UShort"
       ]],
@@ -14163,369 +14185,375 @@
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 427
+          "pointer" : 429
         },
         "ULong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 428
+          "pointer" : 430
         },
         "ULongLong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 429
+          "pointer" : 431
         },
         "Float"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 430
+          "pointer" : 432
         },
         "Double"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 431
+          "pointer" : 433
         },
         "LongDouble"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 432
+          "pointer" : 434
         },
         "Float128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 433
+          "pointer" : 435
         },
         "Float16"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 434
+          "pointer" : 436
         },
         "ShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 435
+          "pointer" : 437
         },
         "Accum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 436
+          "pointer" : 438
         },
         "LongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 437
+          "pointer" : 439
         },
         "UShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 438
+          "pointer" : 440
         },
         "UAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 439
+          "pointer" : 441
         },
         "ULongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 440
+          "pointer" : 442
         },
         "ShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 441
+          "pointer" : 443
         },
         "Fract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 442
+          "pointer" : 444
         },
         "LongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 443
+          "pointer" : 445
         },
         "UShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 444
+          "pointer" : 446
         },
         "UFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 445
+          "pointer" : 447
         },
         "ULongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 446
+          "pointer" : 448
         },
         "SatShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 447
+          "pointer" : 449
         },
         "SatAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 448
+          "pointer" : 450
         },
         "SatLongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 449
+          "pointer" : 451
         },
         "SatUShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 450
+          "pointer" : 452
         },
         "SatUAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 451
+          "pointer" : 453
         },
         "SatULongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 452
+          "pointer" : 454
         },
         "SatShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 453
+          "pointer" : 455
         },
         "SatFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 454
+          "pointer" : 456
         },
         "SatLongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 455
+          "pointer" : 457
         },
         "SatUShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 456
+          "pointer" : 458
         },
         "SatUFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 457
+          "pointer" : 459
         },
         "SatULongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 458
+          "pointer" : 460
         },
         "Int128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 459
+          "pointer" : 461
         },
         "UInt128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 460
+          "pointer" : 462
         },
         "WChar_S"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 461
+          "pointer" : 463
         },
         "Char8"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 462
+          "pointer" : 464
         },
         "Dependent"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 463
+          "pointer" : 465
         },
         "Overload"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 464
+          "pointer" : 466
         },
         "BoundMember"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 205
+          "pointer" : 207
         },
         "PseudoObject"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 465
+          "pointer" : 467
         },
         "UnknownAny"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 466
+          "pointer" : 468
         },
         "ARCUnbridgedCast"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 467
+          "pointer" : 469
         },
         "BuiltinFn"
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 468
+          "pointer" : 470
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 469
+          "pointer" : 471
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 470
+          "pointer" : 472
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 471
+          "pointer" : 473
         }
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 472
+          "pointer" : 474
         },
         "ObjCId"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 473
+          "pointer" : 475
         },
         "ObjCClass"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 474
+          "pointer" : 476
         },
         "ObjCSel"
       ]],
       ["PointerType" , [
         {
-          "pointer" : 112
+          "pointer" : 114
         },
         {
-          "type_ptr" : 101
+          "type_ptr" : 103
         }
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 475
+          "pointer" : 477
         },
         "NullPtr"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 476
+          "pointer" : 478
         },
         "Half"
       ]],
+      ["BuiltinType" , [
+        {
+          "pointer" : 479
+        },
+        "BFloat16"
+      ]],
       ["PointerType" , [
         {
-          "pointer" : 477
+          "pointer" : 480
         },
         {
-          "type_ptr" : 474
+          "type_ptr" : 476
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 478
+          "pointer" : 481
         },
         {
-          "base_type" : 472
+          "base_type" : 474
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 479
+          "pointer" : 482
         },
         {
-          "type_ptr" : 478
+          "type_ptr" : 481
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 480
+          "pointer" : 483
         },
         {
-          "base_type" : 473
+          "base_type" : 475
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 481
+          "pointer" : 484
         },
         {
-          "type_ptr" : 480
+          "type_ptr" : 483
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 482
+          "pointer" : 485
         },
         10
       ]],
       ["RecordType" , [
         {
-          "pointer" : 483
+          "pointer" : 486
         },
-        484
+        487
       ]],
       ["PointerType" , [
         {
-          "pointer" : 485
+          "pointer" : 488
         },
         {
           "type_ptr" : 53,
@@ -14534,34 +14562,34 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 486
+          "pointer" : 489
         },
         {
-          "type_ptr" : 420,
+          "type_ptr" : 422,
           "is_const" : true
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 170
+          "pointer" : 172
         },
         {
-          "type_ptr" : 420
+          "type_ptr" : 422
         }
       ]],
       ["RecordType" , [
         {
-          "pointer" : 487
+          "pointer" : 490
         },
-        488
+        491
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 489
+          "pointer" : 492
         },
         {
           "element_type" : {
-            "type_ptr" : 487
+            "type_ptr" : 490
           },
           "stride" : 24
         },
@@ -14569,18 +14597,18 @@
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 490
+          "pointer" : 493
         },
         18
       ]],
       ["TypedefType" , [
         {
           "pointer" : 7,
-          "desugared_type" : 479
+          "desugared_type" : 482
         },
         {
           "child_type" : {
-            "type_ptr" : 479
+            "type_ptr" : 482
           },
           "decl_ptr" : 6
         }
@@ -14588,23 +14616,23 @@
       ["TypedefType" , [
         {
           "pointer" : 21,
-          "desugared_type" : 479
+          "desugared_type" : 482
         },
         {
           "child_type" : {
             "type_ptr" : 7
           },
-          "decl_ptr" : 418
+          "decl_ptr" : 420
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 9,
-          "desugared_type" : 481
+          "desugared_type" : 484
         },
         {
           "child_type" : {
-            "type_ptr" : 481
+            "type_ptr" : 484
           },
           "decl_ptr" : 8
         }
@@ -14612,11 +14640,11 @@
       ["TypedefType" , [
         {
           "pointer" : 5,
-          "desugared_type" : 477
+          "desugared_type" : 480
         },
         {
           "child_type" : {
-            "type_ptr" : 477
+            "type_ptr" : 480
           },
           "decl_ptr" : 4
         }
@@ -14626,7 +14654,7 @@
           "pointer" : 30
         },
         {
-          "type_ptr" : 490
+          "type_ptr" : 493
         }
       ]],
       ["TypedefType" , [
@@ -14646,18 +14674,18 @@
           "pointer" : 47
         },
         {
-          "type_ptr" : 482
+          "type_ptr" : 485
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 491
+          "pointer" : 494
         },
         50
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 492
+          "pointer" : 495
         },
         56
       ]],
@@ -14678,29 +14706,29 @@
           "pointer" : 59
         },
         {
-          "type_ptr" : 492
+          "type_ptr" : 495
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 493
+          "pointer" : 496
         },
         61
       ]],
       ["IncompleteArrayType" , [
         {
-          "pointer" : 494
+          "pointer" : 497
         },
         {
           "element_type" : {
-            "type_ptr" : 479
+            "type_ptr" : 482
           },
           "stride" : 8
         }
       ]],
       ["IncompleteArrayType" , [
         {
-          "pointer" : 495
+          "pointer" : 498
         },
         {
           "element_type" : {
@@ -14712,7 +14740,7 @@
       ]],
       ["IncompleteArrayType" , [
         {
-          "pointer" : 496
+          "pointer" : 499
         },
         {
           "element_type" : {
@@ -14724,16 +14752,16 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 497
+          "pointer" : 500
         },
         {
-          "type_ptr" : 479,
+          "type_ptr" : 482,
           "is_const" : true
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 498
+          "pointer" : 501
         },
         {
           "type_ptr" : 7,
@@ -14743,10 +14771,10 @@
       ["DecayedType" , [
         {
           "pointer" : 64,
-          "desugared_type" : 498
+          "desugared_type" : 501
         },
         {
-          "type_ptr" : 498
+          "type_ptr" : 501
         }
       ]],
       ["ObjCObjectPointerType" , [
@@ -14754,21 +14782,21 @@
           "pointer" : 72
         },
         {
-          "type_ptr" : 493
+          "type_ptr" : 496
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 499
+          "pointer" : 502
         },
         74
       ]],
       ["PointerType" , [
         {
-          "pointer" : 500
+          "pointer" : 503
         },
         {
-          "type_ptr" : 479
+          "type_ptr" : 482
         }
       ]],
       ["PointerType" , [
@@ -14784,22 +14812,22 @@
           "pointer" : 85
         },
         {
-          "type_ptr" : 499
+          "type_ptr" : 502
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 501
+          "pointer" : 504
         },
         87
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 502
+          "pointer" : 505
         },
         {
           "return_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 103
           }
         },
         {
@@ -14812,11 +14840,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 503
+          "pointer" : 506
         },
         {
           "return_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 103
           }
         },
         {
@@ -14829,28 +14857,28 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 504
+          "pointer" : 507
         },
         {
           "return_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 103
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 479
+              "type_ptr" : 482
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "return_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 103
           }
         },
         {
@@ -14863,40 +14891,40 @@
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 406
+          "pointer" : 408
         },
-        106
+        108
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 505
+          "pointer" : 508
         },
         {
-          "base_type" : 490,
+          "base_type" : 493,
           "protocol_decls_ptr" : [
-            105
+            107
           ]
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 121
+          "pointer" : 123
         },
         {
-          "type_ptr" : 505
+          "type_ptr" : 508
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 126
+          "pointer" : 128
         },
         {
-          "type_ptr" : 406
+          "type_ptr" : 408
         }
       ]],
       ["AttributedType" , [
         {
-          "pointer" : 151,
+          "pointer" : 153,
           "desugared_type" : 59
         },
         {
@@ -14905,11 +14933,11 @@
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 166
+          "pointer" : 168
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
@@ -14917,7 +14945,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 506
+          "pointer" : 509
         },
         {
           "type_ptr" : 53
@@ -14925,31 +14953,31 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 169
+          "pointer" : 171
         },
         {
-          "type_ptr" : 506
+          "type_ptr" : 509
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 507
+          "pointer" : 510
         },
         {
-          "type_ptr" : 504
+          "type_ptr" : 507
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 162
+          "pointer" : 164
         },
         {
-          "type_ptr" : 90
+          "type_ptr" : 91
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 508
+          "pointer" : 511
         },
         {
           "return_type" : {
@@ -14966,7 +14994,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 509
+          "pointer" : 512
         },
         {
           "return_type" : {
@@ -14983,36 +15011,36 @@
       ]],
       ["ParenType" , [
         {
-          "pointer" : 510,
-          "desugared_type" : 509
+          "pointer" : 513,
+          "desugared_type" : 512
         },
         {
-          "type_ptr" : 509
+          "type_ptr" : 512
         }
       ]],
       ["BlockPointerType" , [
         {
-          "pointer" : 511
+          "pointer" : 514
         },
         {
-          "type_ptr" : 508
+          "type_ptr" : 511
         }
       ]],
       ["BlockPointerType" , [
         {
-          "pointer" : 217
+          "pointer" : 219
         },
         {
-          "type_ptr" : 510
+          "type_ptr" : 513
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 512
+          "pointer" : 515
         },
         {
           "return_type" : {
-            "type_ptr" : 462
+            "type_ptr" : 464
           }
         },
         {
@@ -15025,11 +15053,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 513
+          "pointer" : 516
         },
         {
           "return_type" : {
-            "type_ptr" : 462
+            "type_ptr" : 464
           }
         },
         {
@@ -15042,27 +15070,27 @@
       ]],
       ["BlockPointerType" , [
         {
-          "pointer" : 195
+          "pointer" : 197
         },
         {
-          "type_ptr" : 509
+          "type_ptr" : 512
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 228
+          "pointer" : 230
         },
         {
-          "type_ptr" : 491
+          "type_ptr" : 494
         }
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 274
+          "pointer" : 276
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
@@ -15070,19 +15098,19 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 289
+          "pointer" : 291
         },
         {
-          "type_ptr" : 501
+          "type_ptr" : 504
         }
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 286
+          "pointer" : 288
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
@@ -15090,11 +15118,11 @@
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 299
+          "pointer" : 301
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
@@ -15102,11 +15130,11 @@
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 310
+          "pointer" : 312
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
@@ -15114,28 +15142,28 @@
       ]],
       ["ObjCTypeParamType" , [
         {
-          "pointer" : 514,
-          "desugared_type" : 479
+          "pointer" : 517,
+          "desugared_type" : 482
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 515
+          "pointer" : 518
         },
-        365
+        367
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 516
+          "pointer" : 519
         },
-        366
+        368
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 517
+          "pointer" : 520
         },
         {
-          "base_type" : 515,
+          "base_type" : 518,
           "type_args" : [
             {
               "type_ptr" : 30
@@ -15145,37 +15173,37 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 370
+          "pointer" : 372
         },
         {
-          "type_ptr" : 517
+          "type_ptr" : 520
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 518
+          "pointer" : 521
         },
-        373
+        375
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 378
+          "pointer" : 380
         },
         {
-          "type_ptr" : 518
+          "type_ptr" : 521
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 396
+          "pointer" : 398
         },
         {
-          "type_ptr" : 170
+          "type_ptr" : 172
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 393
+          "pointer" : 395
         },
         {
           "return_type" : {
@@ -15188,18 +15216,18 @@
               "type_ptr" : 53
             },
             {
-              "type_ptr" : 396
+              "type_ptr" : 398
             }
           ]
         }
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 409
+          "pointer" : 411
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/bind_temporary.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/bind_temporary.cpp.exp
index 0f7afc5a6..60d040c2b 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/bind_temporary.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/bind_temporary.cpp.exp
@@ -218,7 +218,7 @@
             "type_ptr" : 12
           },
           {
-            "mangled_name" : "320519083853435709",
+            "mangled_name" : "18026356147569087964",
             "is_cpp" : true,
             "decl_ptr_with_body" : 11,
             "body" : ["CompoundStmt" , [
@@ -268,7 +268,7 @@
             "type_ptr" : 15
           },
           {
-            "mangled_name" : "3243028866176254141",
+            "mangled_name" : "1879755393825675851",
             "is_cpp" : true,
             "decl_ptr_with_body" : 14,
             "body" : ["CompoundStmt" , [
@@ -317,7 +317,7 @@
             "type_ptr" : 18
           },
           {
-            "mangled_name" : "1635307583371793064",
+            "mangled_name" : "1652559256541304523",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -1180,15 +1180,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 98
         },
-        99
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 99
+        },
+        100
       ]],
       ["PointerType" , [
         {
-          "pointer" : 100
+          "pointer" : 101
         },
         {
           "type_ptr" : 38,
@@ -1197,7 +1203,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 101
+          "pointer" : 102
         },
         {
           "type_ptr" : 35,
@@ -1206,7 +1212,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 102
+          "pointer" : 103
         },
         {
           "type_ptr" : 35
@@ -1214,17 +1220,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 103
+          "pointer" : 104
         },
-        104
+        105
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 105
+          "pointer" : 106
         },
         {
           "element_type" : {
-            "type_ptr" : 103
+            "type_ptr" : 104
           },
           "stride" : 24
         },
@@ -1238,7 +1244,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 106
+          "pointer" : 107
         },
         {
           "type_ptr" : 8
@@ -1258,7 +1264,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 107
+          "pointer" : 108
         },
         {
           "return_type" : {
@@ -1291,7 +1297,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 108
+          "pointer" : 109
         },
         {
           "return_type" : {
@@ -1325,7 +1331,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 109
+          "pointer" : 110
         },
         {
           "base_type" : 92
@@ -1333,32 +1339,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 110
+          "pointer" : 111
         },
         {
-          "type_ptr" : 109
+          "type_ptr" : 110
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 111,
-          "desugared_type" : 110
+          "pointer" : 112,
+          "desugared_type" : 111
         },
         {
           "child_type" : {
-            "type_ptr" : 110
+            "type_ptr" : 111
           },
-          "decl_ptr" : 112
+          "decl_ptr" : 113
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 32,
-          "desugared_type" : 110
+          "desugared_type" : 111
         },
         {
           "child_type" : {
-            "type_ptr" : 111
+            "type_ptr" : 112
           },
           "decl_ptr" : 31
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_attributes.c.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_attributes.c.exp
index bdf172db9..d7cf2b293 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_attributes.c.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_attributes.c.exp
@@ -598,15 +598,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 76
         },
-        77
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 77
+        },
+        78
       ]],
       ["PointerType" , [
         {
-          "pointer" : 78
+          "pointer" : 79
         },
         {
           "type_ptr" : 11,
@@ -615,7 +621,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 79
+          "pointer" : 80
         },
         {
           "type_ptr" : 16,
@@ -624,7 +630,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 80
+          "pointer" : 81
         },
         {
           "type_ptr" : 16
@@ -632,17 +638,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 81
+          "pointer" : 82
         },
-        82
+        83
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 83
+          "pointer" : 84
         },
         {
           "element_type" : {
-            "type_ptr" : 81
+            "type_ptr" : 82
           },
           "stride" : 24
         },
@@ -667,7 +673,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
           "base_type" : 70
@@ -675,32 +681,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 85
+          "pointer" : 86
         },
         {
-          "type_ptr" : 84
+          "type_ptr" : 85
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 86,
-          "desugared_type" : 85
+          "pointer" : 87,
+          "desugared_type" : 86
         },
         {
           "child_type" : {
-            "type_ptr" : 85
+            "type_ptr" : 86
           },
-          "decl_ptr" : 87
+          "decl_ptr" : 88
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 13,
-          "desugared_type" : 85
+          "desugared_type" : 86
         },
         {
           "child_type" : {
-            "type_ptr" : 86
+            "type_ptr" : 87
           },
           "decl_ptr" : 12
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_cast.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_cast.cpp.exp
index 29ce09530..83c933b67 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_cast.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_cast.cpp.exp
@@ -871,15 +871,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 86
         },
-        87
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 87
+        },
+        88
       ]],
       ["PointerType" , [
         {
-          "pointer" : 88
+          "pointer" : 89
         },
         {
           "type_ptr" : 8,
@@ -888,7 +894,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
           "type_ptr" : 25,
@@ -897,7 +903,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "type_ptr" : 25
@@ -905,17 +911,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 91
+          "pointer" : 92
         },
-        92
+        93
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 93
+          "pointer" : 94
         },
         {
           "element_type" : {
-            "type_ptr" : 91
+            "type_ptr" : 92
           },
           "stride" : 24
         },
@@ -923,7 +929,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 94
+          "pointer" : 95
         },
         {
           "base_type" : 80
@@ -931,32 +937,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 95
+          "pointer" : 96
         },
         {
-          "type_ptr" : 94
+          "type_ptr" : 95
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 96,
-          "desugared_type" : 95
+          "pointer" : 97,
+          "desugared_type" : 96
         },
         {
           "child_type" : {
-            "type_ptr" : 95
+            "type_ptr" : 96
           },
-          "decl_ptr" : 97
+          "decl_ptr" : 98
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 22,
-          "desugared_type" : 95
+          "desugared_type" : 96
         },
         {
           "child_type" : {
-            "type_ptr" : 96
+            "type_ptr" : 97
           },
           "decl_ptr" : 21
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/class_template.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/class_template.cpp.exp
index ff5471e25..d5aed1816 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/class_template.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/class_template.cpp.exp
@@ -279,7 +279,7 @@
                       "type_ptr" : 15
                     },
                     {
-                      "mangled_name" : "7066629788491464130",
+                      "mangled_name" : "5073671504388348295",
                       "is_cpp" : true,
                       "is_inline" : true,
                       "decl_ptr_with_body" : 14,
@@ -393,7 +393,7 @@
                       "type_ptr" : 20
                     },
                     {
-                      "mangled_name" : "11949468677960817094",
+                      "mangled_name" : "8283222246682784723",
                       "is_cpp" : true,
                       "is_inline" : true,
                       "parameters" : [
@@ -455,7 +455,7 @@
                       "type_ptr" : 24
                     },
                     {
-                      "mangled_name" : "14813278630171558444",
+                      "mangled_name" : "6839343167991811455",
                       "is_cpp" : true,
                       "is_inline" : true,
                       "parameters" : [
@@ -501,7 +501,7 @@
                 {
                   "is_pod" : true
                 },
-                "15160212752071097404",
+                "",
                 {
                   "template_decl" : 8,
                   "specialization_args" : [
@@ -615,7 +615,7 @@
           },
           {
           },
-          "15216485236755079891",
+          "",
           {
             "template_decl" : 8,
             "specialization_args" : [
@@ -745,7 +745,7 @@
                 "type_ptr" : 15
               },
               {
-                "mangled_name" : "13141222913637319333",
+                "mangled_name" : "12645234317802235044",
                 "is_cpp" : true,
                 "is_inline" : true,
                 "decl_ptr_with_body" : 18,
@@ -795,7 +795,7 @@
                 "type_ptr" : 41
               },
               {
-                "mangled_name" : "16063732695960137765",
+                "mangled_name" : "14822900838502915635",
                 "is_cpp" : true,
                 "is_inline" : true
               },
@@ -829,7 +829,7 @@
                 "type_ptr" : 43
               },
               {
-                "mangled_name" : "16241844907223898831",
+                "mangled_name" : "8232226518557505494",
                 "is_cpp" : true,
                 "is_inline" : true,
                 "parameters" : [
@@ -891,7 +891,7 @@
                 "type_ptr" : 47
               },
               {
-                "mangled_name" : "6117498947183732003",
+                "mangled_name" : "10012197224398183680",
                 "is_cpp" : true,
                 "is_inline" : true,
                 "parameters" : [
@@ -1357,7 +1357,7 @@
               }
             }
           },
-          "9300085993929073917",
+          "",
           {
             "template_decl" : 8,
             "specialization_args" : [
@@ -2221,15 +2221,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 149
         },
-        150
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 150
+        },
+        151
       ]],
       ["PointerType" , [
         {
-          "pointer" : 151
+          "pointer" : 152
         },
         {
           "type_ptr" : 38,
@@ -2238,7 +2244,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 152
+          "pointer" : 153
         },
         {
           "type_ptr" : 87,
@@ -2247,7 +2253,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 153
+          "pointer" : 154
         },
         {
           "type_ptr" : 87
@@ -2255,17 +2261,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 154
+          "pointer" : 155
         },
-        155
+        156
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 156
+          "pointer" : 157
         },
         {
           "element_type" : {
-            "type_ptr" : 154
+            "type_ptr" : 155
           },
           "stride" : 24
         },
@@ -2273,27 +2279,27 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 157
+          "pointer" : 158
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 158
+          "pointer" : 159
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 159
+          "pointer" : 160
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 160
+          "pointer" : 161
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 161
+          "pointer" : 162
         }
       ]],
       ["TemplateTypeParmType" , [
@@ -2306,12 +2312,12 @@
           "pointer" : 33
         },
         {
-          "type_ptr" : 157
+          "type_ptr" : 158
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 162
+          "pointer" : 163
         },
         {
           "type_ptr" : 32
@@ -2319,12 +2325,12 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 163
+          "pointer" : 164
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 164
+          "pointer" : 165
         }
       ]],
       ["InjectedClassNameType" , [
@@ -2334,7 +2340,7 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 165
+          "pointer" : 166
         }
       ]],
       ["RecordType" , [
@@ -2345,7 +2351,7 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 166,
+          "pointer" : 167,
           "desugared_type" : 35
         }
       ]],
@@ -2357,7 +2363,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 167
+          "pointer" : 168
         },
         {
           "return_type" : {
@@ -2391,7 +2397,7 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 168,
+          "pointer" : 169,
           "desugared_type" : 35
         }
       ]],
@@ -2405,10 +2411,10 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 169
+          "pointer" : 170
         },
         {
-          "type_ptr" : 168
+          "type_ptr" : 169
         }
       ]],
       ["RecordType" , [
@@ -2431,7 +2437,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 170
+          "pointer" : 171
         },
         {
           "type_ptr" : 13
@@ -2439,7 +2445,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 171
+          "pointer" : 172
         },
         {
           "return_type" : {
@@ -2451,7 +2457,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 172
+          "pointer" : 173
         },
         {
           "return_type" : {
@@ -2463,7 +2469,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 173
+          "pointer" : 174
         },
         {
           "return_type" : {
@@ -2505,7 +2511,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 174
+          "pointer" : 175
         },
         {
           "return_type" : {
@@ -2547,7 +2553,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 175
+          "pointer" : 176
         },
         {
           "return_type" : {
@@ -2581,7 +2587,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 176
+          "pointer" : 177
         },
         {
           "return_type" : {
@@ -2623,7 +2629,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 177
+          "pointer" : 178
         },
         {
           "return_type" : {
@@ -2669,7 +2675,7 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 178
+          "pointer" : 179
         },
         {
           "type_ptr" : 35
@@ -2677,11 +2683,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 179
+          "pointer" : 180
         },
         {
           "return_type" : {
-            "type_ptr" : 178
+            "type_ptr" : 179
           }
         },
         {
@@ -2694,11 +2700,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 180
+          "pointer" : 181
         },
         {
           "return_type" : {
-            "type_ptr" : 178
+            "type_ptr" : 179
           }
         },
         {
@@ -2711,11 +2717,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 181
+          "pointer" : 182
         },
         {
           "return_type" : {
-            "type_ptr" : 178
+            "type_ptr" : 179
           }
         },
         {
@@ -2732,7 +2738,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 178
+            "type_ptr" : 179
           }
         },
         {
@@ -2749,7 +2755,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 178
+            "type_ptr" : 179
           }
         },
         {
@@ -2762,10 +2768,10 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 182
+          "pointer" : 183
         },
         {
-          "type_ptr" : 179
+          "type_ptr" : 180
         }
       ]],
       ["PointerType" , [
@@ -2778,7 +2784,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 183
+          "pointer" : 184
         },
         {
           "base_type" : 143
@@ -2786,32 +2792,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 184
+          "pointer" : 185
         },
         {
-          "type_ptr" : 183
+          "type_ptr" : 184
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 185,
-          "desugared_type" : 184
+          "pointer" : 186,
+          "desugared_type" : 185
         },
         {
           "child_type" : {
-            "type_ptr" : 184
+            "type_ptr" : 185
           },
-          "decl_ptr" : 186
+          "decl_ptr" : 187
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 84,
-          "desugared_type" : 184
+          "desugared_type" : 185
         },
         {
           "child_type" : {
-            "type_ptr" : 185
+            "type_ptr" : 186
           },
           "decl_ptr" : 83
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/comments.c.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/comments.c.exp
index 72430f790..a6f5ea41a 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/comments.c.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/comments.c.exp
@@ -570,15 +570,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 75
         },
-        76
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 76
+        },
+        77
       ]],
       ["PointerType" , [
         {
-          "pointer" : 77
+          "pointer" : 78
         },
         {
           "type_ptr" : 17,
@@ -587,7 +593,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 78
+          "pointer" : 79
         },
         {
           "type_ptr" : 14,
@@ -596,7 +602,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 79
+          "pointer" : 80
         },
         {
           "type_ptr" : 14
@@ -604,17 +610,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 80
+          "pointer" : 81
         },
-        81
+        82
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 82
+          "pointer" : 83
         },
         {
           "element_type" : {
-            "type_ptr" : 80
+            "type_ptr" : 81
           },
           "stride" : 24
         },
@@ -632,7 +638,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 83
+          "pointer" : 84
         },
         {
           "base_type" : 69
@@ -640,32 +646,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
-          "type_ptr" : 83
+          "type_ptr" : 84
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 85,
-          "desugared_type" : 84
+          "pointer" : 86,
+          "desugared_type" : 85
         },
         {
           "child_type" : {
-            "type_ptr" : 84
+            "type_ptr" : 85
           },
-          "decl_ptr" : 86
+          "decl_ptr" : 87
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 11,
-          "desugared_type" : 84
+          "desugared_type" : 85
         },
         {
           "child_type" : {
-            "type_ptr" : 85
+            "type_ptr" : 86
           },
           "decl_ptr" : 10
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/const_cast.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/const_cast.cpp.exp
index 910d2450e..64f214741 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/const_cast.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/const_cast.cpp.exp
@@ -1082,15 +1082,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 96
         },
-        97
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 97
+        },
+        98
       ]],
       ["PointerType" , [
         {
-          "pointer" : 98
+          "pointer" : 99
         },
         {
           "type_ptr" : 30,
@@ -1099,7 +1105,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 99
+          "pointer" : 100
         },
         {
           "type_ptr" : 35,
@@ -1108,7 +1114,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 100
+          "pointer" : 101
         },
         {
           "type_ptr" : 35
@@ -1116,17 +1122,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 101
+          "pointer" : 102
         },
-        102
+        103
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 103
+          "pointer" : 104
         },
         {
           "element_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 102
           },
           "stride" : 24
         },
@@ -1140,7 +1146,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 104
+          "pointer" : 105
         },
         {
           "type_ptr" : 8
@@ -1194,7 +1200,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 105
+          "pointer" : 106
         },
         {
           "type_ptr" : 8,
@@ -1203,7 +1209,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 106
+          "pointer" : 107
         },
         {
           "base_type" : 90
@@ -1211,32 +1217,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 107
+          "pointer" : 108
         },
         {
-          "type_ptr" : 106
+          "type_ptr" : 107
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 108,
-          "desugared_type" : 107
+          "pointer" : 109,
+          "desugared_type" : 108
         },
         {
           "child_type" : {
-            "type_ptr" : 107
+            "type_ptr" : 108
           },
-          "decl_ptr" : 109
+          "decl_ptr" : 110
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 33,
-          "desugared_type" : 107
+          "desugared_type" : 108
         },
         {
           "child_type" : {
-            "type_ptr" : 108
+            "type_ptr" : 109
           },
           "decl_ptr" : 32
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/dynamic_cast.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/dynamic_cast.cpp.exp
index cfa55d2d1..939327dd3 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/dynamic_cast.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/dynamic_cast.cpp.exp
@@ -374,7 +374,7 @@
             "type_ptr" : 22
           },
           {
-            "mangled_name" : "5328378654181921475",
+            "mangled_name" : "6691652126532499765",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -409,7 +409,7 @@
             "type_ptr" : 24
           },
           {
-            "mangled_name" : "14779025497907219583",
+            "mangled_name" : "16649858826465904026",
             "is_cpp" : true,
             "is_inline" : true,
             "decl_ptr_with_body" : 23,
@@ -459,7 +459,7 @@
             "type_ptr" : 27
           },
           {
-            "mangled_name" : "3430056695640597274",
+            "mangled_name" : "6367731417382615745",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -520,7 +520,7 @@
             "type_ptr" : 30
           },
           {
-            "mangled_name" : "1361265890968139694",
+            "mangled_name" : "17956886967408801671",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -785,7 +785,7 @@
             "type_ptr" : 44
           },
           {
-            "mangled_name" : "7876366742276079110",
+            "mangled_name" : "6627935060446176348",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -820,7 +820,7 @@
             "type_ptr" : 24
           },
           {
-            "mangled_name" : "10798876524598897542",
+            "mangled_name" : "8928078380412315851",
             "is_cpp" : true,
             "is_inline" : true,
             "decl_ptr_with_body" : 45,
@@ -920,7 +920,7 @@
             "type_ptr" : 49
           },
           {
-            "mangled_name" : "7710293714478488613",
+            "mangled_name" : "6925252787601137710",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -981,7 +981,7 @@
             "type_ptr" : 52
           },
           {
-            "mangled_name" : "16903082029399050859",
+            "mangled_name" : "17350102287109130674",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -3510,15 +3510,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 176
         },
-        177
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 177
+        },
+        178
       ]],
       ["PointerType" , [
         {
-          "pointer" : 178
+          "pointer" : 179
         },
         {
           "type_ptr" : 116,
@@ -3527,7 +3533,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 179
+          "pointer" : 180
         },
         {
           "type_ptr" : 113,
@@ -3536,7 +3542,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 180
+          "pointer" : 181
         },
         {
           "type_ptr" : 113
@@ -3544,17 +3550,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 181
+          "pointer" : 182
         },
-        182
+        183
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 183
+          "pointer" : 184
         },
         {
           "element_type" : {
-            "type_ptr" : 181
+            "type_ptr" : 182
           },
           "stride" : 24
         },
@@ -3605,7 +3611,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 184
+          "pointer" : 185
         },
         {
           "return_type" : {
@@ -3647,7 +3653,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 185
+          "pointer" : 186
         },
         {
           "return_type" : {
@@ -3716,7 +3722,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 186
+          "pointer" : 187
         },
         {
           "return_type" : {
@@ -3758,7 +3764,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 187
+          "pointer" : 188
         },
         {
           "return_type" : {
@@ -3810,7 +3816,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 188
+          "pointer" : 189
         },
         {
           "return_type" : {
@@ -3822,7 +3828,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 189
+          "pointer" : 190
         },
         {
           "return_type" : {
@@ -3856,7 +3862,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 190
+          "pointer" : 191
         },
         {
           "return_type" : {
@@ -3902,7 +3908,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 191
+          "pointer" : 192
         },
         {
           "return_type" : {
@@ -3914,7 +3920,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 192
+          "pointer" : 193
         },
         {
           "return_type" : {
@@ -3948,7 +3954,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 193
+          "pointer" : 194
         },
         {
           "return_type" : {
@@ -4006,7 +4012,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 194
+          "pointer" : 195
         },
         {
           "base_type" : 170
@@ -4014,32 +4020,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 195
+          "pointer" : 196
         },
         {
-          "type_ptr" : 194
+          "type_ptr" : 195
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 196,
-          "desugared_type" : 195
+          "pointer" : 197,
+          "desugared_type" : 196
         },
         {
           "child_type" : {
-            "type_ptr" : 195
+            "type_ptr" : 196
           },
-          "decl_ptr" : 197
+          "decl_ptr" : 198
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 110,
-          "desugared_type" : 195
+          "desugared_type" : 196
         },
         {
           "child_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           },
           "decl_ptr" : 109
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/expr_with_cleanups.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/expr_with_cleanups.cpp.exp
index 99682cce0..c59a85150 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/expr_with_cleanups.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/expr_with_cleanups.cpp.exp
@@ -218,7 +218,7 @@
             "type_ptr" : 12
           },
           {
-            "mangled_name" : "4951616904021883133",
+            "mangled_name" : "5585539233588788972",
             "is_cpp" : true,
             "parameters" : [
               ["ParmVarDecl" , [
@@ -279,7 +279,7 @@
             "type_ptr" : 16
           },
           {
-            "mangled_name" : "11474741413113936247",
+            "mangled_name" : "7390596848467712836",
             "is_cpp" : true,
             "parameters" : [
               ["ParmVarDecl" , [
@@ -401,7 +401,7 @@
             "type_ptr" : 23
           },
           {
-            "mangled_name" : "9850251229546392500",
+            "mangled_name" : "10975959821506117086",
             "is_cpp" : true
           },
           {
@@ -535,7 +535,7 @@
             "type_ptr" : 12
           },
           {
-            "mangled_name" : "14898886720565199942",
+            "mangled_name" : "16769418782937754571",
             "is_cpp" : true,
             "parameters" : [
               ["ParmVarDecl" , [
@@ -596,7 +596,7 @@
             "type_ptr" : 23
           },
           {
-            "mangled_name" : "11799330211249239787",
+            "mangled_name" : "13039880593729639901",
             "is_cpp" : true
           },
           {
@@ -631,7 +631,7 @@
             "type_ptr" : 32
           },
           {
-            "mangled_name" : "7125450473324676530",
+            "mangled_name" : "18119742553314115417",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -3706,15 +3706,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 177
         },
-        178
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 178
+        },
+        179
       ]],
       ["PointerType" , [
         {
-          "pointer" : 179
+          "pointer" : 180
         },
         {
           "type_ptr" : 14,
@@ -3723,7 +3729,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 180
+          "pointer" : 181
         },
         {
           "type_ptr" : 115,
@@ -3732,7 +3738,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 181
+          "pointer" : 182
         },
         {
           "type_ptr" : 115
@@ -3740,17 +3746,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 182
+          "pointer" : 183
         },
-        183
+        184
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 184
+          "pointer" : 185
         },
         {
           "element_type" : {
-            "type_ptr" : 182
+            "type_ptr" : 183
           },
           "stride" : 24
         },
@@ -3764,7 +3770,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 185
+          "pointer" : 186
         },
         {
           "type_ptr" : 8
@@ -3815,7 +3821,7 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 186
+          "pointer" : 187
         },
         {
           "type_ptr" : 8
@@ -3827,7 +3833,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 186
+            "type_ptr" : 187
           }
         },
         {
@@ -3852,7 +3858,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 187
+          "pointer" : 188
         },
         {
           "return_type" : {
@@ -3870,7 +3876,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 188
+          "pointer" : 189
         },
         {
           "type_ptr" : 25
@@ -3878,7 +3884,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 189
+          "pointer" : 190
         },
         {
           "return_type" : {
@@ -3953,7 +3959,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 190
+          "pointer" : 191
         },
         {
           "return_type" : {
@@ -3970,7 +3976,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 191
+          "pointer" : 192
         },
         {
           "return_type" : {
@@ -4020,7 +4026,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 192
+          "pointer" : 193
         },
         {
           "base_type" : 171
@@ -4028,32 +4034,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 193
+          "pointer" : 194
         },
         {
-          "type_ptr" : 192
+          "type_ptr" : 193
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 194,
-          "desugared_type" : 193
+          "pointer" : 195,
+          "desugared_type" : 194
         },
         {
           "child_type" : {
-            "type_ptr" : 193
+            "type_ptr" : 194
           },
-          "decl_ptr" : 195
+          "decl_ptr" : 196
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 112,
-          "desugared_type" : 193
+          "desugared_type" : 194
         },
         {
           "child_type" : {
-            "type_ptr" : 194
+            "type_ptr" : 195
           },
           "decl_ptr" : 111
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/friend.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/friend.cpp.exp
index 88305ed02..81c535f01 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/friend.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/friend.cpp.exp
@@ -169,7 +169,7 @@
             },
             {
             },
-            "8348715085918813141",
+            "",
             {
               "template_decl" : 7,
               "specialization_args" : [
@@ -347,7 +347,7 @@
                   "type_ptr" : 20
                 },
                 {
-                  "mangled_name" : "17039860285578718334",
+                  "mangled_name" : "15291750046890212067",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 19,
@@ -397,7 +397,7 @@
                   "type_ptr" : 23
                 },
                 {
-                  "mangled_name" : "10269173081916450237",
+                  "mangled_name" : "225939024662492936",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -458,7 +458,7 @@
                   "type_ptr" : 27
                 },
                 {
-                  "mangled_name" : "15856009432989426751",
+                  "mangled_name" : "11375010590039767716",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -504,7 +504,7 @@
             {
               "is_pod" : true
             },
-            "12207844931495093295",
+            "",
             {
               "template_decl" : 11,
               "specialization_args" : [
@@ -1002,15 +1002,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 100
         },
-        101
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 101
+        },
+        102
       ]],
       ["PointerType" , [
         {
-          "pointer" : 102
+          "pointer" : 103
         },
         {
           "type_ptr" : 30,
@@ -1019,7 +1025,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 103
+          "pointer" : 104
         },
         {
           "type_ptr" : 38,
@@ -1028,7 +1034,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 104
+          "pointer" : 105
         },
         {
           "type_ptr" : 38
@@ -1036,17 +1042,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 105
+          "pointer" : 106
         },
-        106
+        107
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 107
+          "pointer" : 108
         },
         {
           "element_type" : {
-            "type_ptr" : 105
+            "type_ptr" : 106
           },
           "stride" : 24
         },
@@ -1054,104 +1060,104 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 108
+          "pointer" : 109
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 109
+          "pointer" : 110
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 110
+          "pointer" : 111
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 111
+          "pointer" : 112
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 112
+          "pointer" : 113
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 113
+          "pointer" : 114
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 114
+          "pointer" : 115
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 115
+          "pointer" : 116
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 116
+          "pointer" : 117
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 117
+          "pointer" : 118
         },
         {
-          "type_ptr" : 108
+          "type_ptr" : 109
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 118
+          "pointer" : 119
         },
         {
-          "type_ptr" : 113
+          "type_ptr" : 114
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 119
+          "pointer" : 120
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 120
+          "pointer" : 121
         }
       ]],
       ["ElaboratedType" , [
         {
-          "pointer" : 121,
-          "desugared_type" : 120
+          "pointer" : 122,
+          "desugared_type" : 121
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 122
+          "pointer" : 123
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 123
+          "pointer" : 124
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 124
+          "pointer" : 125
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 125
+          "pointer" : 126
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 126
+          "pointer" : 127
         }
       ]],
       ["RecordType" , [
@@ -1168,7 +1174,7 @@
       ]],
       ["SubstTemplateTypeParmType" , [
         {
-          "pointer" : 127,
+          "pointer" : 128,
           "desugared_type" : 30
         }
       ]],
@@ -1182,10 +1188,10 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 128
+          "pointer" : 129
         },
         {
-          "type_ptr" : 127
+          "type_ptr" : 128
         }
       ]],
       ["RecordType" , [
@@ -1196,7 +1202,7 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 129,
+          "pointer" : 130,
           "desugared_type" : 9
         }
       ]],
@@ -1208,12 +1214,12 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 130
+          "pointer" : 131
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 131
+          "pointer" : 132
         },
         {
           "return_type" : {
@@ -1225,7 +1231,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 132
+          "pointer" : 133
         },
         {
           "return_type" : {
@@ -1246,7 +1252,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 133
+          "pointer" : 134
         },
         {
           "return_type" : {
@@ -1288,7 +1294,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 134
+          "pointer" : 135
         },
         {
           "return_type" : {
@@ -1334,7 +1340,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 135
+          "pointer" : 136
         },
         {
           "base_type" : 94
@@ -1342,32 +1348,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 136
+          "pointer" : 137
         },
         {
-          "type_ptr" : 135
+          "type_ptr" : 136
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 137,
-          "desugared_type" : 136
+          "pointer" : 138,
+          "desugared_type" : 137
         },
         {
           "child_type" : {
-            "type_ptr" : 136
+            "type_ptr" : 137
           },
-          "decl_ptr" : 138
+          "decl_ptr" : 139
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 35,
-          "desugared_type" : 136
+          "desugared_type" : 137
         },
         {
           "child_type" : {
-            "type_ptr" : 137
+            "type_ptr" : 138
           },
           "decl_ptr" : 34
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/function_template.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/function_template.cpp.exp
index 5a973d81d..9bb0c16eb 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/function_template.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/function_template.cpp.exp
@@ -1815,15 +1815,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 131
         },
-        132
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 132
+        },
+        133
       ]],
       ["PointerType" , [
         {
-          "pointer" : 133
+          "pointer" : 134
         },
         {
           "type_ptr" : 38,
@@ -1832,7 +1838,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 134
+          "pointer" : 135
         },
         {
           "type_ptr" : 25,
@@ -1841,7 +1847,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 135
+          "pointer" : 136
         },
         {
           "type_ptr" : 25
@@ -1849,17 +1855,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 136
+          "pointer" : 137
         },
-        137
+        138
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 138
+          "pointer" : 139
         },
         {
           "element_type" : {
-            "type_ptr" : 136
+            "type_ptr" : 137
           },
           "stride" : 24
         },
@@ -1867,44 +1873,44 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 139
+          "pointer" : 140
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 140
+          "pointer" : 141
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 141
+          "pointer" : 142
         },
         {
           "return_type" : {
-            "type_ptr" : 139
+            "type_ptr" : 140
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 139
+              "type_ptr" : 140
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 142
+          "pointer" : 143
         },
         {
           "return_type" : {
-            "type_ptr" : 140
+            "type_ptr" : 141
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 140
+              "type_ptr" : 141
             }
           ]
         }
@@ -1928,30 +1934,30 @@
       ]],
       ["SubstTemplateTypeParmType" , [
         {
-          "pointer" : 143,
+          "pointer" : 144,
           "desugared_type" : 38
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 144
+          "pointer" : 145
         },
         {
           "return_type" : {
-            "type_ptr" : 143
+            "type_ptr" : 144
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 143
+              "type_ptr" : 144
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 145
+          "pointer" : 146
         },
         {
           "return_type" : {
@@ -2009,7 +2015,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 146
+          "pointer" : 147
         },
         {
           "return_type" : {
@@ -2043,10 +2049,10 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 147
+          "pointer" : 148
         },
         {
-          "type_ptr" : 146
+          "type_ptr" : 147
         }
       ]],
       ["PointerType" , [
@@ -2065,7 +2071,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 148
+          "pointer" : 149
         },
         {
           "return_type" : {
@@ -2099,10 +2105,10 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 149
+          "pointer" : 150
         },
         {
-          "type_ptr" : 148
+          "type_ptr" : 149
         }
       ]],
       ["PointerType" , [
@@ -2115,7 +2121,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 150
+          "pointer" : 151
         },
         {
           "base_type" : 125
@@ -2123,32 +2129,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 151
+          "pointer" : 152
         },
         {
-          "type_ptr" : 150
+          "type_ptr" : 151
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 152,
-          "desugared_type" : 151
+          "pointer" : 153,
+          "desugared_type" : 152
         },
         {
           "child_type" : {
-            "type_ptr" : 151
+            "type_ptr" : 152
           },
-          "decl_ptr" : 153
+          "decl_ptr" : 154
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 69,
-          "desugared_type" : 151
+          "desugared_type" : 152
         },
         {
           "child_type" : {
-            "type_ptr" : 152
+            "type_ptr" : 153
           },
           "decl_ptr" : 68
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheritance.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheritance.cpp.exp
index 145e6f0d8..9cdfae44f 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheritance.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheritance.cpp.exp
@@ -981,7 +981,7 @@
             "type_ptr" : 52
           },
           {
-            "mangled_name" : "7469005664164565375",
+            "mangled_name" : "8602613147659843985",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -2577,7 +2577,7 @@
             "type_ptr" : 125
           },
           {
-            "mangled_name" : "4580501627556196443",
+            "mangled_name" : "5821333485013418573",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -3035,15 +3035,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 188
         },
-        189
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 189
+        },
+        190
       ]],
       ["PointerType" , [
         {
-          "pointer" : 190
+          "pointer" : 191
         },
         {
           "type_ptr" : 22,
@@ -3052,7 +3058,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 191
+          "pointer" : 192
         },
         {
           "type_ptr" : 128,
@@ -3061,7 +3067,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 192
+          "pointer" : 193
         },
         {
           "type_ptr" : 128
@@ -3069,17 +3075,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 193
+          "pointer" : 194
         },
-        194
+        195
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 195
+          "pointer" : 196
         },
         {
           "element_type" : {
-            "type_ptr" : 193
+            "type_ptr" : 194
           },
           "stride" : 24
         },
@@ -3179,7 +3185,7 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 196
+          "pointer" : 197
         },
         {
           "type_ptr" : 16
@@ -3196,11 +3202,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 197
+          "pointer" : 198
         },
         {
           "return_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           }
         },
         {
@@ -3217,7 +3223,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           }
         },
         {
@@ -3238,11 +3244,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 198
+          "pointer" : 199
         },
         {
           "return_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           }
         },
         {
@@ -3259,7 +3265,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           }
         },
         {
@@ -3310,7 +3316,7 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 199
+          "pointer" : 200
         },
         {
           "type_ptr" : 54
@@ -3327,11 +3333,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 200
+          "pointer" : 201
         },
         {
           "return_type" : {
-            "type_ptr" : 199
+            "type_ptr" : 200
           }
         },
         {
@@ -3348,7 +3354,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 199
+            "type_ptr" : 200
           }
         },
         {
@@ -3369,11 +3375,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 201
+          "pointer" : 202
         },
         {
           "return_type" : {
-            "type_ptr" : 199
+            "type_ptr" : 200
           }
         },
         {
@@ -3390,7 +3396,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 199
+            "type_ptr" : 200
           }
         },
         {
@@ -3431,7 +3437,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 202
+          "pointer" : 203
         },
         {
           "base_type" : 182
@@ -3439,32 +3445,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 203
+          "pointer" : 204
         },
         {
-          "type_ptr" : 202
+          "type_ptr" : 203
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 204,
-          "desugared_type" : 203
+          "pointer" : 205,
+          "desugared_type" : 204
         },
         {
           "child_type" : {
-            "type_ptr" : 203
+            "type_ptr" : 204
           },
-          "decl_ptr" : 205
+          "decl_ptr" : 206
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 127,
-          "desugared_type" : 203
+          "desugared_type" : 204
         },
         {
           "child_type" : {
-            "type_ptr" : 204
+            "type_ptr" : 205
           },
           "decl_ptr" : 126
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheriting_constructor.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheriting_constructor.cpp.exp
index 0018677da..76b6b872d 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheriting_constructor.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheriting_constructor.cpp.exp
@@ -203,7 +203,7 @@
             "type_ptr" : 11
           },
           {
-            "mangled_name" : "14779048587651412014",
+            "mangled_name" : "16649826940628685907",
             "is_cpp" : true,
             "parameters" : [
               ["ParmVarDecl" , [
@@ -327,7 +327,7 @@
             "type_ptr" : 19
           },
           {
-            "mangled_name" : "3430056695640597274",
+            "mangled_name" : "6367731417382615745",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -388,7 +388,7 @@
             "type_ptr" : 23
           },
           {
-            "mangled_name" : "1361265890968139694",
+            "mangled_name" : "17956886967408801671",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -449,7 +449,7 @@
             "type_ptr" : 27
           },
           {
-            "mangled_name" : "5328378654181921475",
+            "mangled_name" : "6691652126532499765",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -655,7 +655,7 @@
             "type_ptr" : 36
           },
           {
-            "mangled_name" : "10798876524598897542",
+            "mangled_name" : "8928078380412315851",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -688,7 +688,7 @@
             "type_ptr" : 38
           },
           {
-            "mangled_name" : "7710293714478488613",
+            "mangled_name" : "6925252787601137710",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -749,7 +749,7 @@
             "type_ptr" : 42
           },
           {
-            "mangled_name" : "16903082029399050859",
+            "mangled_name" : "17350102287109130674",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -813,7 +813,7 @@
             "type_ptr" : 46
           },
           {
-            "mangled_name" : "18258347749069050656",
+            "mangled_name" : "5352909623164416057",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -1558,15 +1558,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 123
         },
-        124
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 124
+        },
+        125
       ]],
       ["PointerType" , [
         {
-          "pointer" : 125
+          "pointer" : 126
         },
         {
           "type_ptr" : 13,
@@ -1575,7 +1581,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 126
+          "pointer" : 127
         },
         {
           "type_ptr" : 61,
@@ -1584,7 +1590,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 127
+          "pointer" : 128
         },
         {
           "type_ptr" : 61
@@ -1592,17 +1598,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 128
+          "pointer" : 129
         },
-        129
+        130
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 130
+          "pointer" : 131
         },
         {
           "element_type" : {
-            "type_ptr" : 128
+            "type_ptr" : 129
           },
           "stride" : 24
         },
@@ -1616,7 +1622,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 131
+          "pointer" : 132
         },
         {
           "type_ptr" : 8
@@ -1668,7 +1674,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 132
+          "pointer" : 133
         },
         {
           "return_type" : {
@@ -1710,7 +1716,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 133
+          "pointer" : 134
         },
         {
           "return_type" : {
@@ -1765,7 +1771,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 134
+          "pointer" : 135
         },
         {
           "return_type" : {
@@ -1819,7 +1825,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 135
+          "pointer" : 136
         },
         {
           "return_type" : {
@@ -1865,15 +1871,15 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 136
+          "pointer" : 137
         },
         {
-          "type_ptr" : 127
+          "type_ptr" : 128
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 137
+          "pointer" : 138
         },
         {
           "return_type" : {
@@ -1907,7 +1913,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 138
+          "pointer" : 139
         },
         {
           "base_type" : 117
@@ -1915,32 +1921,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 139
+          "pointer" : 140
         },
         {
-          "type_ptr" : 138
+          "type_ptr" : 139
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 140,
-          "desugared_type" : 139
+          "pointer" : 141,
+          "desugared_type" : 140
         },
         {
           "child_type" : {
-            "type_ptr" : 139
+            "type_ptr" : 140
           },
-          "decl_ptr" : 141
+          "decl_ptr" : 142
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 58,
-          "desugared_type" : 139
+          "desugared_type" : 140
         },
         {
           "child_type" : {
-            "type_ptr" : 140
+            "type_ptr" : 141
           },
           "decl_ptr" : 57
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/lambda.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/lambda.cpp.exp
index b06bedd6b..ab797418c 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/lambda.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/lambda.cpp.exp
@@ -564,7 +564,7 @@
                                         "type_ptr" : 31
                                       },
                                       {
-                                        "mangled_name" : "11922868141377072075",
+                                        "mangled_name" : "13286141613727650365",
                                         "is_cpp" : true,
                                         "is_inline" : true
                                       },
@@ -598,7 +598,7 @@
                                         "type_ptr" : 33
                                       },
                                       {
-                                        "mangled_name" : "11530695906998885266",
+                                        "mangled_name" : "10693628329110131385",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -662,7 +662,7 @@
                                         "type_ptr" : 37
                                       },
                                       {
-                                        "mangled_name" : "12828931072019093462",
+                                        "mangled_name" : "18362977156530360911",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -1148,7 +1148,7 @@
                                             "type_ptr" : 31
                                           },
                                           {
-                                            "mangled_name" : "11922868141377072075",
+                                            "mangled_name" : "13286141613727650365",
                                             "is_cpp" : true,
                                             "is_inline" : true
                                           },
@@ -1182,7 +1182,7 @@
                                             "type_ptr" : 33
                                           },
                                           {
-                                            "mangled_name" : "11530695906998885266",
+                                            "mangled_name" : "10693628329110131385",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -1246,7 +1246,7 @@
                                             "type_ptr" : 37
                                           },
                                           {
-                                            "mangled_name" : "12828931072019093462",
+                                            "mangled_name" : "18362977156530360911",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -1912,7 +1912,7 @@
                                         "type_ptr" : 31
                                       },
                                       {
-                                        "mangled_name" : "16202408192376244884",
+                                        "mangled_name" : "17450839874206147646",
                                         "is_cpp" : true,
                                         "is_inline" : true
                                       },
@@ -1946,7 +1946,7 @@
                                         "type_ptr" : 65
                                       },
                                       {
-                                        "mangled_name" : "9965911517403679447",
+                                        "mangled_name" : "34143097794571044",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -2010,7 +2010,7 @@
                                         "type_ptr" : 69
                                       },
                                       {
-                                        "mangled_name" : "8193408137476215445",
+                                        "mangled_name" : "4775778177696808400",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -3039,7 +3039,7 @@
                                             "type_ptr" : 31
                                           },
                                           {
-                                            "mangled_name" : "16202408192376244884",
+                                            "mangled_name" : "17450839874206147646",
                                             "is_cpp" : true,
                                             "is_inline" : true
                                           },
@@ -3073,7 +3073,7 @@
                                             "type_ptr" : 65
                                           },
                                           {
-                                            "mangled_name" : "9965911517403679447",
+                                            "mangled_name" : "34143097794571044",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -3137,7 +3137,7 @@
                                             "type_ptr" : 69
                                           },
                                           {
-                                            "mangled_name" : "8193408137476215445",
+                                            "mangled_name" : "4775778177696808400",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -4033,7 +4033,7 @@
                                         "type_ptr" : 31
                                       },
                                       {
-                                        "mangled_name" : "17098733838812833493",
+                                        "mangled_name" : "15857901981355611363",
                                         "is_cpp" : true,
                                         "is_inline" : true
                                       },
@@ -4067,7 +4067,7 @@
                                         "type_ptr" : 100
                                       },
                                       {
-                                        "mangled_name" : "14201972727608021968",
+                                        "mangled_name" : "7938324828555278899",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -4131,7 +4131,7 @@
                                         "type_ptr" : 104
                                       },
                                       {
-                                        "mangled_name" : "3001717133787422796",
+                                        "mangled_name" : "4960955440766632321",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -4921,7 +4921,7 @@
                                             "type_ptr" : 31
                                           },
                                           {
-                                            "mangled_name" : "17098733838812833493",
+                                            "mangled_name" : "15857901981355611363",
                                             "is_cpp" : true,
                                             "is_inline" : true
                                           },
@@ -4955,7 +4955,7 @@
                                             "type_ptr" : 100
                                           },
                                           {
-                                            "mangled_name" : "14201972727608021968",
+                                            "mangled_name" : "7938324828555278899",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -5019,7 +5019,7 @@
                                             "type_ptr" : 104
                                           },
                                           {
-                                            "mangled_name" : "3001717133787422796",
+                                            "mangled_name" : "4960955440766632321",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -5874,15 +5874,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 182
         },
-        183
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 183
+        },
+        184
       ]],
       ["PointerType" , [
         {
-          "pointer" : 184
+          "pointer" : 185
         },
         {
           "type_ptr" : 12,
@@ -5891,7 +5897,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 185
+          "pointer" : 186
         },
         {
           "type_ptr" : 120,
@@ -5900,7 +5906,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 186
+          "pointer" : 187
         },
         {
           "type_ptr" : 120
@@ -5908,17 +5914,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 187
+          "pointer" : 188
         },
-        188
+        189
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 189
+          "pointer" : 190
         },
         {
           "element_type" : {
-            "type_ptr" : 187
+            "type_ptr" : 188
           },
           "stride" : 24
         },
@@ -5938,19 +5944,19 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 190
+          "pointer" : 191
         },
         {
-          "type_ptr" : 186
+          "type_ptr" : 187
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 191
+          "pointer" : 192
         },
         {
           "return_type" : {
-            "type_ptr" : 192
+            "type_ptr" : 193
           }
         },
         {
@@ -5964,12 +5970,12 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 193
+          "pointer" : 194
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 194
+          "pointer" : 195
         }
       ]],
       ["AutoType" , [
@@ -5980,7 +5986,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 195
+          "pointer" : 196
         },
         {
           "return_type" : {
@@ -6016,7 +6022,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 196
+          "pointer" : 197
         },
         {
           "type_ptr" : 8
@@ -6024,7 +6030,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 197
+          "pointer" : 198
         },
         {
           "type_ptr" : 29
@@ -6032,11 +6038,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 198
+          "pointer" : 199
         },
         {
           "return_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           }
         },
         {
@@ -6048,7 +6054,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 197
+            "type_ptr" : 198
           }
         },
         {
@@ -6056,7 +6062,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 199
+          "pointer" : 200
         },
         {
           "return_type" : {
@@ -6068,7 +6074,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 200
+          "pointer" : 201
         },
         {
           "return_type" : {
@@ -6092,7 +6098,7 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 201
+          "pointer" : 202
         }
       ]],
       ["AutoType" , [
@@ -6112,7 +6118,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 202
+          "pointer" : 203
         },
         {
           "return_type" : {
@@ -6154,7 +6160,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 203
+          "pointer" : 204
         },
         {
           "return_type" : {
@@ -6171,7 +6177,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 204
+          "pointer" : 205
         },
         {
           "return_type" : {
@@ -6205,11 +6211,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 205
+          "pointer" : 206
         },
         {
           "return_type" : {
-            "type_ptr" : 192
+            "type_ptr" : 193
           }
         },
         {
@@ -6236,12 +6242,12 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 206
+          "pointer" : 207
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 207
+          "pointer" : 208
         },
         {
           "return_type" : {
@@ -6275,7 +6281,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 208
+          "pointer" : 209
         },
         {
           "return_type" : {
@@ -6287,7 +6293,7 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 209
+          "pointer" : 210
         }
       ]],
       ["AutoType" , [
@@ -6307,7 +6313,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 210
+          "pointer" : 211
         },
         {
           "return_type" : {
@@ -6349,7 +6355,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 211
+          "pointer" : 212
         },
         {
           "return_type" : {
@@ -6366,7 +6372,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 212
+          "pointer" : 213
         },
         {
           "return_type" : {
@@ -6400,7 +6406,7 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 213
+          "pointer" : 214
         }
       ]],
       ["RecordType" , [
@@ -6411,12 +6417,12 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 214
+          "pointer" : 215
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 215
+          "pointer" : 216
         },
         {
           "return_type" : {
@@ -6428,7 +6434,7 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 216
+          "pointer" : 217
         }
       ]],
       ["AutoType" , [
@@ -6448,7 +6454,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 217
+          "pointer" : 218
         },
         {
           "return_type" : {
@@ -6490,7 +6496,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 218
+          "pointer" : 219
         },
         {
           "return_type" : {
@@ -6507,7 +6513,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 219
+          "pointer" : 220
         },
         {
           "return_type" : {
@@ -6541,7 +6547,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 220
+          "pointer" : 221
         },
         {
           "base_type" : 176
@@ -6549,32 +6555,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 221
+          "pointer" : 222
         },
         {
-          "type_ptr" : 220
+          "type_ptr" : 221
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 222,
-          "desugared_type" : 221
+          "pointer" : 223,
+          "desugared_type" : 222
         },
         {
           "child_type" : {
-            "type_ptr" : 221
+            "type_ptr" : 222
           },
-          "decl_ptr" : 223
+          "decl_ptr" : 224
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 117,
-          "desugared_type" : 221
+          "desugared_type" : 222
         },
         {
           "child_type" : {
-            "type_ptr" : 222
+            "type_ptr" : 223
           },
           "decl_ptr" : 116
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/materialize_temporary.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/materialize_temporary.cpp.exp
index ec2c2ef82..36880ff0e 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/materialize_temporary.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/materialize_temporary.cpp.exp
@@ -673,15 +673,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 80
         },
-        81
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 81
+        },
+        82
       ]],
       ["PointerType" , [
         {
-          "pointer" : 82
+          "pointer" : 83
         },
         {
           "type_ptr" : 14,
@@ -690,7 +696,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 83
+          "pointer" : 84
         },
         {
           "type_ptr" : 19,
@@ -699,7 +705,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
           "type_ptr" : 19
@@ -707,17 +713,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 85
+          "pointer" : 86
         },
-        86
+        87
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 87
+          "pointer" : 88
         },
         {
           "element_type" : {
-            "type_ptr" : 85
+            "type_ptr" : 86
           },
           "stride" : 24
         },
@@ -734,7 +740,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 88
+          "pointer" : 89
         },
         {
           "base_type" : 74
@@ -742,32 +748,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
-          "type_ptr" : 88
+          "type_ptr" : 89
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 90,
-          "desugared_type" : 89
+          "pointer" : 91,
+          "desugared_type" : 90
         },
         {
           "child_type" : {
-            "type_ptr" : 89
+            "type_ptr" : 90
           },
-          "decl_ptr" : 91
+          "decl_ptr" : 92
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 16,
-          "desugared_type" : 89
+          "desugared_type" : 90
         },
         {
           "child_type" : {
-            "type_ptr" : 90
+            "type_ptr" : 91
           },
           "decl_ptr" : 15
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/namespace_decl.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/namespace_decl.cpp.exp
index 31e27d7f9..7f0f1ecd3 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/namespace_decl.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/namespace_decl.cpp.exp
@@ -754,15 +754,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 81
         },
-        82
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 82
+        },
+        83
       ]],
       ["PointerType" , [
         {
-          "pointer" : 83
+          "pointer" : 84
         },
         {
           "type_ptr" : 12,
@@ -771,7 +777,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
           "type_ptr" : 19,
@@ -780,7 +786,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 85
+          "pointer" : 86
         },
         {
           "type_ptr" : 19
@@ -788,17 +794,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 86
+          "pointer" : 87
         },
-        87
+        88
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 88
+          "pointer" : 89
         },
         {
           "element_type" : {
-            "type_ptr" : 86
+            "type_ptr" : 87
           },
           "stride" : 24
         },
@@ -806,7 +812,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
           "base_type" : 75
@@ -814,32 +820,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
-          "type_ptr" : 89
+          "type_ptr" : 90
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 91,
-          "desugared_type" : 90
+          "pointer" : 92,
+          "desugared_type" : 91
         },
         {
           "child_type" : {
-            "type_ptr" : 90
+            "type_ptr" : 91
           },
-          "decl_ptr" : 92
+          "decl_ptr" : 93
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 16,
-          "desugared_type" : 90
+          "desugared_type" : 91
         },
         {
           "child_type" : {
-            "type_ptr" : 91
+            "type_ptr" : 92
           },
           "decl_ptr" : 15
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/new.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/new.cpp.exp
index 4a724c079..b8c089d6a 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/new.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/new.cpp.exp
@@ -231,7 +231,7 @@
             "type_ptr" : 13
           },
           {
-            "mangled_name" : "8251339330154476193",
+            "mangled_name" : "7740115901201927888",
             "is_cpp" : true,
             "is_inline" : true,
             "decl_ptr_with_body" : 12,
@@ -280,7 +280,7 @@
             "type_ptr" : 16
           },
           {
-            "mangled_name" : "14628250159452892772",
+            "mangled_name" : "12480848167264656407",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -341,7 +341,7 @@
             "type_ptr" : 20
           },
           {
-            "mangled_name" : "3036348191925830672",
+            "mangled_name" : "6070336924810484949",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -403,7 +403,7 @@
             "type_ptr" : 13
           },
           {
-            "mangled_name" : "6606037711693769625",
+            "mangled_name" : "5472746887547415783",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -608,7 +608,7 @@
             "type_ptr" : 31
           },
           {
-            "mangled_name" : "1107470972604094108",
+            "mangled_name" : "1603213277834459133",
             "is_cpp" : true,
             "decl_ptr_with_body" : 30,
             "body" : ["CompoundStmt" , [
@@ -818,7 +818,7 @@
             "type_ptr" : 37
           },
           {
-            "mangled_name" : "4402068687990998056",
+            "mangled_name" : "5877806831249345467",
             "is_cpp" : true,
             "parameters" : [
               ["ParmVarDecl" , [
@@ -1155,7 +1155,7 @@
             "type_ptr" : 47
           },
           {
-            "mangled_name" : "17856063292060911243",
+            "mangled_name" : "17833126256375871848",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -1216,7 +1216,7 @@
             "type_ptr" : 51
           },
           {
-            "mangled_name" : "6680359559125245897",
+            "mangled_name" : "16041718976592305524",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -1278,7 +1278,7 @@
             "type_ptr" : 13
           },
           {
-            "mangled_name" : "10313252178728731272",
+            "mangled_name" : "11561666268372582658",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -3193,6 +3193,28 @@
               ]
             },
             "DefaultVisibility"
+          ]],
+          ["ReturnsNonNullAttr" , [
+            {
+              "pointer" : 121,
+              "source_range" : [
+                {
+                },
+                {
+                }
+              ]
+            }
+          ]],
+          ["AllocSizeAttr" , [
+            {
+              "pointer" : 122,
+              "source_range" : [
+                {
+                },
+                {
+                }
+              ]
+            }
           ]]
         ]
       },
@@ -3203,7 +3225,7 @@
         ]
       },
       {
-        "type_ptr" : 121
+        "type_ptr" : 123
       },
       {
         "mangled_name" : "5103882463850428890",
@@ -3211,7 +3233,7 @@
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 122,
+              "pointer" : 124,
               "source_range" : [
                 {
                 },
@@ -3238,7 +3260,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 123,
+        "pointer" : 125,
         "source_range" : [
           {
           },
@@ -3251,7 +3273,7 @@
         "attributes" : [
           ["VisibilityAttr" , [
             {
-              "pointer" : 124,
+              "pointer" : 126,
               "source_range" : [
                 {
                 },
@@ -3260,6 +3282,28 @@
               ]
             },
             "DefaultVisibility"
+          ]],
+          ["ReturnsNonNullAttr" , [
+            {
+              "pointer" : 127,
+              "source_range" : [
+                {
+                },
+                {
+                }
+              ]
+            }
+          ]],
+          ["AllocSizeAttr" , [
+            {
+              "pointer" : 128,
+              "source_range" : [
+                {
+                },
+                {
+                }
+              ]
+            }
           ]]
         ]
       },
@@ -3270,7 +3314,7 @@
         ]
       },
       {
-        "type_ptr" : 121
+        "type_ptr" : 123
       },
       {
         "mangled_name" : "5124988689061404296",
@@ -3278,7 +3322,7 @@
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 125,
+              "pointer" : 129,
               "source_range" : [
                 {
                 },
@@ -3305,7 +3349,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 126,
+        "pointer" : 130,
         "source_range" : [
           {
           },
@@ -3318,7 +3362,7 @@
         "attributes" : [
           ["VisibilityAttr" , [
             {
-              "pointer" : 127,
+              "pointer" : 131,
               "source_range" : [
                 {
                 },
@@ -3337,7 +3381,7 @@
         ]
       },
       {
-        "type_ptr" : 128
+        "type_ptr" : 132
       },
       {
         "mangled_name" : "9332647001762808742",
@@ -3345,7 +3389,7 @@
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 129,
+              "pointer" : 133,
               "source_range" : [
                 {
                 },
@@ -3361,7 +3405,7 @@
               ]
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
               "parm_index_in_function" : 0
@@ -3372,7 +3416,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 131,
+        "pointer" : 135,
         "source_range" : [
           {
           },
@@ -3385,7 +3429,7 @@
         "attributes" : [
           ["VisibilityAttr" , [
             {
-              "pointer" : 132,
+              "pointer" : 136,
               "source_range" : [
                 {
                 },
@@ -3404,7 +3448,7 @@
         ]
       },
       {
-        "type_ptr" : 128
+        "type_ptr" : 132
       },
       {
         "mangled_name" : "12453587667872411061",
@@ -3412,7 +3456,7 @@
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 133,
+              "pointer" : 137,
               "source_range" : [
                 {
                 },
@@ -3428,7 +3472,7 @@
               ]
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
               "parm_index_in_function" : 0
@@ -3439,7 +3483,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 134,
+        "pointer" : 138,
         "source_range" : [
           {
             "line" : 38,
@@ -3463,10 +3507,10 @@
       {
         "mangled_name" : "6095890702841955930",
         "is_cpp" : true,
-        "decl_ptr_with_body" : 134,
+        "decl_ptr_with_body" : 138,
         "body" : ["CompoundStmt" , [
           {
-            "pointer" : 135,
+            "pointer" : 139,
             "source_range" : [
               {
                 "line" : 38,
@@ -3481,7 +3525,7 @@
           [
             ["DeclStmt" , [
               {
-                "pointer" : 136,
+                "pointer" : 140,
                 "source_range" : [
                   {
                     "line" : 39,
@@ -3495,7 +3539,7 @@
               [
                 ["CXXNewExpr" , [
                   {
-                    "pointer" : 137,
+                    "pointer" : 141,
                     "source_range" : [
                       {
                         "column" : 13
@@ -3508,7 +3552,7 @@
                   [
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 138,
+                        "pointer" : 142,
                         "source_range" : [
                           {
                             "column" : 21
@@ -3521,7 +3565,7 @@
                       [
                         ["IntegerLiteral" , [
                           {
-                            "pointer" : 139,
+                            "pointer" : 143,
                             "source_range" : [
                               {
                                 "column" : 21
@@ -3558,7 +3602,7 @@
                     ]],
                     ["InitListExpr" , [
                       {
-                        "pointer" : 140,
+                        "pointer" : 144,
                         "source_range" : [
                           {
                             "column" : 23
@@ -3571,7 +3615,7 @@
                       [
                         ["IntegerLiteral" , [
                           {
-                            "pointer" : 141,
+                            "pointer" : 145,
                             "source_range" : [
                               {
                                 "column" : 24
@@ -3596,7 +3640,7 @@
                         ]],
                         ["IntegerLiteral" , [
                           {
-                            "pointer" : 142,
+                            "pointer" : 146,
                             "source_range" : [
                               {
                                 "column" : 27
@@ -3621,7 +3665,7 @@
                         ]],
                         ["IntegerLiteral" , [
                           {
-                            "pointer" : 143,
+                            "pointer" : 147,
                             "source_range" : [
                               {
                                 "column" : 30
@@ -3647,7 +3691,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 144
+                          "type_ptr" : 148
                         }
                       }
                     ]]
@@ -3659,15 +3703,15 @@
                   },
                   {
                     "is_array" : true,
-                    "array_size_expr" : 138,
-                    "initializer_expr" : 140
+                    "array_size_expr" : 142,
+                    "initializer_expr" : 144
                   }
                 ]]
               ],
               [
                 ["VarDecl" , [
                   {
-                    "pointer" : 145,
+                    "pointer" : 149,
                     "source_range" : [
                       {
                         "column" : 3
@@ -3689,7 +3733,7 @@
                   {
                     "init_expr" : ["CXXNewExpr" , [
                       {
-                        "pointer" : 137,
+                        "pointer" : 141,
                         "source_range" : [
                           {
                             "column" : 13
@@ -3702,7 +3746,7 @@
                       [
                         ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 138,
+                            "pointer" : 142,
                             "source_range" : [
                               {
                                 "column" : 21
@@ -3715,7 +3759,7 @@
                           [
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 139,
+                                "pointer" : 143,
                                 "source_range" : [
                                   {
                                     "column" : 21
@@ -3752,7 +3796,7 @@
                         ]],
                         ["InitListExpr" , [
                           {
-                            "pointer" : 140,
+                            "pointer" : 144,
                             "source_range" : [
                               {
                                 "column" : 23
@@ -3765,7 +3809,7 @@
                           [
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 141,
+                                "pointer" : 145,
                                 "source_range" : [
                                   {
                                     "column" : 24
@@ -3790,7 +3834,7 @@
                             ]],
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 142,
+                                "pointer" : 146,
                                 "source_range" : [
                                   {
                                     "column" : 27
@@ -3815,7 +3859,7 @@
                             ]],
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 143,
+                                "pointer" : 147,
                                 "source_range" : [
                                   {
                                     "column" : 30
@@ -3841,7 +3885,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 144
+                              "type_ptr" : 148
                             }
                           }
                         ]]
@@ -3853,8 +3897,8 @@
                       },
                       {
                         "is_array" : true,
-                        "array_size_expr" : 138,
-                        "initializer_expr" : 140
+                        "array_size_expr" : 142,
+                        "initializer_expr" : 144
                       }
                     ]]
                   }
@@ -3863,7 +3907,7 @@
             ]],
             ["DeclStmt" , [
               {
-                "pointer" : 146,
+                "pointer" : 150,
                 "source_range" : [
                   {
                     "line" : 40,
@@ -3877,7 +3921,7 @@
               [
                 ["CXXNewExpr" , [
                   {
-                    "pointer" : 147,
+                    "pointer" : 151,
                     "source_range" : [
                       {
                         "column" : 13
@@ -3890,7 +3934,7 @@
                   [
                     ["CXXConstructExpr" , [
                       {
-                        "pointer" : 148,
+                        "pointer" : 152,
                         "source_range" : [
                           {
                             "column" : 17
@@ -3903,7 +3947,7 @@
                       [
                         ["IntegerLiteral" , [
                           {
-                            "pointer" : 149,
+                            "pointer" : 153,
                             "source_range" : [
                               {
                                 "column" : 25
@@ -3928,7 +3972,7 @@
                         ]],
                         ["IntegerLiteral" , [
                           {
-                            "pointer" : 150,
+                            "pointer" : 154,
                             "source_range" : [
                               {
                                 "column" : 28
@@ -3981,14 +4025,14 @@
                     }
                   },
                   {
-                    "initializer_expr" : 148
+                    "initializer_expr" : 152
                   }
                 ]]
               ],
               [
                 ["VarDecl" , [
                   {
-                    "pointer" : 151,
+                    "pointer" : 155,
                     "source_range" : [
                       {
                         "column" : 3
@@ -4010,7 +4054,7 @@
                   {
                     "init_expr" : ["CXXNewExpr" , [
                       {
-                        "pointer" : 147,
+                        "pointer" : 151,
                         "source_range" : [
                           {
                             "column" : 13
@@ -4023,7 +4067,7 @@
                       [
                         ["CXXConstructExpr" , [
                           {
-                            "pointer" : 148,
+                            "pointer" : 152,
                             "source_range" : [
                               {
                                 "column" : 17
@@ -4036,7 +4080,7 @@
                           [
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 149,
+                                "pointer" : 153,
                                 "source_range" : [
                                   {
                                     "column" : 25
@@ -4061,7 +4105,7 @@
                             ]],
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 150,
+                                "pointer" : 154,
                                 "source_range" : [
                                   {
                                     "column" : 28
@@ -4114,7 +4158,7 @@
                         }
                       },
                       {
-                        "initializer_expr" : 148
+                        "initializer_expr" : 152
                       }
                     ]]
                   }
@@ -4123,7 +4167,7 @@
             ]],
             ["DeclStmt" , [
               {
-                "pointer" : 152,
+                "pointer" : 156,
                 "source_range" : [
                   {
                     "line" : 41,
@@ -4137,7 +4181,7 @@
               [
                 ["CXXNewExpr" , [
                   {
-                    "pointer" : 153,
+                    "pointer" : 157,
                     "source_range" : [
                       {
                         "column" : 15
@@ -4150,7 +4194,7 @@
                   [
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 154,
+                        "pointer" : 158,
                         "source_range" : [
                           {
                             "column" : 27
@@ -4163,7 +4207,7 @@
                       [
                         ["IntegerLiteral" , [
                           {
-                            "pointer" : 155,
+                            "pointer" : 159,
                             "source_range" : [
                               {
                                 "column" : 27
@@ -4200,7 +4244,7 @@
                     ]],
                     ["InitListExpr" , [
                       {
-                        "pointer" : 156,
+                        "pointer" : 160,
                         "source_range" : [
                           {
                             "column" : 29
@@ -4213,7 +4257,7 @@
                       [
                         ["CXXConstructExpr" , [
                           {
-                            "pointer" : 157,
+                            "pointer" : 161,
                             "source_range" : [
                               {
                                 "column" : 30
@@ -4226,7 +4270,7 @@
                           [
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 158,
+                                "pointer" : 162,
                                 "source_range" : [
                                   {
                                     "column" : 31
@@ -4251,7 +4295,7 @@
                             ]],
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 159,
+                                "pointer" : 163,
                                 "source_range" : [
                                   {
                                     "column" : 34
@@ -4299,7 +4343,7 @@
                         ]],
                         ["CXXConstructExpr" , [
                           {
-                            "pointer" : 160,
+                            "pointer" : 164,
                             "source_range" : [
                               {
                                 "column" : 38
@@ -4312,7 +4356,7 @@
                           [
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 161,
+                                "pointer" : 165,
                                 "source_range" : [
                                   {
                                     "column" : 39
@@ -4337,7 +4381,7 @@
                             ]],
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 162,
+                                "pointer" : 166,
                                 "source_range" : [
                                   {
                                     "column" : 42
@@ -4385,7 +4429,7 @@
                         ]],
                         ["CXXConstructExpr" , [
                           {
-                            "pointer" : 163,
+                            "pointer" : 167,
                             "source_range" : [
                               {
                                 "column" : 46
@@ -4398,7 +4442,7 @@
                           [
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 164,
+                                "pointer" : 168,
                                 "source_range" : [
                                   {
                                     "column" : 47
@@ -4423,7 +4467,7 @@
                             ]],
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 165,
+                                "pointer" : 169,
                                 "source_range" : [
                                   {
                                     "column" : 50
@@ -4472,7 +4516,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 166
+                          "type_ptr" : 170
                         }
                       }
                     ]]
@@ -4484,15 +4528,15 @@
                   },
                   {
                     "is_array" : true,
-                    "array_size_expr" : 154,
-                    "initializer_expr" : 156
+                    "array_size_expr" : 158,
+                    "initializer_expr" : 160
                   }
                 ]]
               ],
               [
                 ["VarDecl" , [
                   {
-                    "pointer" : 167,
+                    "pointer" : 171,
                     "source_range" : [
                       {
                         "column" : 3
@@ -4514,7 +4558,7 @@
                   {
                     "init_expr" : ["CXXNewExpr" , [
                       {
-                        "pointer" : 153,
+                        "pointer" : 157,
                         "source_range" : [
                           {
                             "column" : 15
@@ -4527,7 +4571,7 @@
                       [
                         ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 154,
+                            "pointer" : 158,
                             "source_range" : [
                               {
                                 "column" : 27
@@ -4540,7 +4584,7 @@
                           [
                             ["IntegerLiteral" , [
                               {
-                                "pointer" : 155,
+                                "pointer" : 159,
                                 "source_range" : [
                                   {
                                     "column" : 27
@@ -4577,7 +4621,7 @@
                         ]],
                         ["InitListExpr" , [
                           {
-                            "pointer" : 156,
+                            "pointer" : 160,
                             "source_range" : [
                               {
                                 "column" : 29
@@ -4590,7 +4634,7 @@
                           [
                             ["CXXConstructExpr" , [
                               {
-                                "pointer" : 157,
+                                "pointer" : 161,
                                 "source_range" : [
                                   {
                                     "column" : 30
@@ -4603,7 +4647,7 @@
                               [
                                 ["IntegerLiteral" , [
                                   {
-                                    "pointer" : 158,
+                                    "pointer" : 162,
                                     "source_range" : [
                                       {
                                         "column" : 31
@@ -4628,7 +4672,7 @@
                                 ]],
                                 ["IntegerLiteral" , [
                                   {
-                                    "pointer" : 159,
+                                    "pointer" : 163,
                                     "source_range" : [
                                       {
                                         "column" : 34
@@ -4676,7 +4720,7 @@
                             ]],
                             ["CXXConstructExpr" , [
                               {
-                                "pointer" : 160,
+                                "pointer" : 164,
                                 "source_range" : [
                                   {
                                     "column" : 38
@@ -4689,7 +4733,7 @@
                               [
                                 ["IntegerLiteral" , [
                                   {
-                                    "pointer" : 161,
+                                    "pointer" : 165,
                                     "source_range" : [
                                       {
                                         "column" : 39
@@ -4714,7 +4758,7 @@
                                 ]],
                                 ["IntegerLiteral" , [
                                   {
-                                    "pointer" : 162,
+                                    "pointer" : 166,
                                     "source_range" : [
                                       {
                                         "column" : 42
@@ -4762,7 +4806,7 @@
                             ]],
                             ["CXXConstructExpr" , [
                               {
-                                "pointer" : 163,
+                                "pointer" : 167,
                                 "source_range" : [
                                   {
                                     "column" : 46
@@ -4775,7 +4819,7 @@
                               [
                                 ["IntegerLiteral" , [
                                   {
-                                    "pointer" : 164,
+                                    "pointer" : 168,
                                     "source_range" : [
                                       {
                                         "column" : 47
@@ -4800,7 +4844,7 @@
                                 ]],
                                 ["IntegerLiteral" , [
                                   {
-                                    "pointer" : 165,
+                                    "pointer" : 169,
                                     "source_range" : [
                                       {
                                         "column" : 50
@@ -4849,7 +4893,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 166
+                              "type_ptr" : 170
                             }
                           }
                         ]]
@@ -4861,8 +4905,8 @@
                       },
                       {
                         "is_array" : true,
-                        "array_size_expr" : 154,
-                        "initializer_expr" : 156
+                        "array_size_expr" : 158,
+                        "initializer_expr" : 160
                       }
                     ]]
                   }
@@ -4875,7 +4919,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 168,
+        "pointer" : 172,
         "source_range" : [
           {
             "line" : 45,
@@ -4896,7 +4940,7 @@
         ]
       },
       {
-        "type_ptr" : 169
+        "type_ptr" : 173
       },
       {
         "mangled_name" : "13351464032276683690",
@@ -4904,7 +4948,7 @@
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 170,
+              "pointer" : 174,
               "source_range" : [
                 {
                   "line" : 45,
@@ -4930,7 +4974,7 @@
           ]],
           ["ParmVarDecl" , [
             {
-              "pointer" : 171,
+              "pointer" : 175,
               "source_range" : [
                 {
                   "column" : 40
@@ -4947,7 +4991,7 @@
               ]
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
               "parm_index_in_function" : 1
@@ -4955,7 +4999,7 @@
           ]],
           ["ParmVarDecl" , [
             {
-              "pointer" : 172,
+              "pointer" : 176,
               "source_range" : [
                 {
                   "column" : 51
@@ -4974,17 +5018,17 @@
               ]
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
               "parm_index_in_function" : 2
             }
           ]]
         ],
-        "decl_ptr_with_body" : 168,
+        "decl_ptr_with_body" : 172,
         "body" : ["CompoundStmt" , [
           {
-            "pointer" : 173,
+            "pointer" : 177,
             "source_range" : [
               {
                 "column" : 72
@@ -4998,7 +5042,7 @@
           [
             ["ReturnStmt" , [
               {
-                "pointer" : 174,
+                "pointer" : 178,
                 "source_range" : [
                   {
                     "line" : 46,
@@ -5012,7 +5056,7 @@
               [
                 ["ImplicitCastExpr" , [
                   {
-                    "pointer" : 175,
+                    "pointer" : 179,
                     "source_range" : [
                       {
                         "column" : 10
@@ -5025,7 +5069,7 @@
                   [
                     ["DeclRefExpr" , [
                       {
-                        "pointer" : 176,
+                        "pointer" : 180,
                         "source_range" : [
                           {
                             "column" : 10
@@ -5039,14 +5083,14 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 130
+                          "type_ptr" : 134
                         },
                         "value_kind" : "LValue"
                       },
                       {
                         "decl_ref" : {
                           "kind" : "ParmVar",
-                          "decl_pointer" : 172,
+                          "decl_pointer" : 176,
                           "name" : {
                             "name" : "ptr2",
                             "qual_name" : [
@@ -5054,7 +5098,7 @@
                             ]
                           },
                           "qual_type" : {
-                            "type_ptr" : 130
+                            "type_ptr" : 134
                           }
                         }
                       }
@@ -5062,7 +5106,7 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 130
+                      "type_ptr" : 134
                     }
                   },
                   {
@@ -5079,7 +5123,7 @@
     ]],
     ["EmptyDecl" , [
       {
-        "pointer" : 177,
+        "pointer" : 181,
         "source_range" : [
           {
             "line" : 47,
@@ -5093,7 +5137,7 @@
     ]],
     ["FunctionDecl" , [
       {
-        "pointer" : 178,
+        "pointer" : 182,
         "source_range" : [
           {
             "line" : 49,
@@ -5112,7 +5156,7 @@
         ]
       },
       {
-        "type_ptr" : 179
+        "type_ptr" : 183
       },
       {
         "mangled_name" : "1553186570458038035",
@@ -5120,7 +5164,7 @@
         "parameters" : [
           ["ParmVarDecl" , [
             {
-              "pointer" : 180,
+              "pointer" : 184,
               "source_range" : [
                 {
                   "line" : 49,
@@ -5140,17 +5184,17 @@
               ]
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
               "parm_index_in_function" : 0
             }
           ]]
         ],
-        "decl_ptr_with_body" : 178,
+        "decl_ptr_with_body" : 182,
         "body" : ["CompoundStmt" , [
           {
-            "pointer" : 181,
+            "pointer" : 185,
             "source_range" : [
               {
                 "column" : 32
@@ -5164,7 +5208,7 @@
           [
             ["DeclStmt" , [
               {
-                "pointer" : 182,
+                "pointer" : 186,
                 "source_range" : [
                   {
                     "line" : 50,
@@ -5178,7 +5222,7 @@
               [
                 ["IntegerLiteral" , [
                   {
-                    "pointer" : 183,
+                    "pointer" : 187,
                     "source_range" : [
                       {
                         "column" : 11
@@ -5205,7 +5249,7 @@
               [
                 ["VarDecl" , [
                   {
-                    "pointer" : 184,
+                    "pointer" : 188,
                     "source_range" : [
                       {
                         "column" : 3
@@ -5229,7 +5273,7 @@
                   {
                     "init_expr" : ["IntegerLiteral" , [
                       {
-                        "pointer" : 183,
+                        "pointer" : 187,
                         "source_range" : [
                           {
                             "column" : 11
@@ -5258,7 +5302,7 @@
             ]],
             ["DeclStmt" , [
               {
-                "pointer" : 185,
+                "pointer" : 189,
                 "source_range" : [
                   {
                     "line" : 51,
@@ -5272,7 +5316,7 @@
               [
                 ["CXXNewExpr" , [
                   {
-                    "pointer" : 186,
+                    "pointer" : 190,
                     "source_range" : [
                       {
                         "column" : 13
@@ -5285,7 +5329,7 @@
                   [
                     ["CXXConstructExpr" , [
                       {
-                        "pointer" : 187,
+                        "pointer" : 191,
                         "source_range" : [
                           {
                             "column" : 27
@@ -5321,7 +5365,7 @@
                     ]],
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 188,
+                        "pointer" : 192,
                         "source_range" : [
                           {
                             "column" : 18
@@ -5334,7 +5378,7 @@
                       [
                         ["DeclRefExpr" , [
                           {
-                            "pointer" : 189,
+                            "pointer" : 193,
                             "source_range" : [
                               {
                                 "column" : 18
@@ -5348,14 +5392,14 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 130
+                              "type_ptr" : 134
                             },
                             "value_kind" : "LValue"
                           },
                           {
                             "decl_ref" : {
                               "kind" : "ParmVar",
-                              "decl_pointer" : 180,
+                              "decl_pointer" : 184,
                               "name" : {
                                 "name" : "ptr",
                                 "qual_name" : [
@@ -5363,7 +5407,7 @@
                                 ]
                               },
                               "qual_type" : {
-                                "type_ptr" : 130
+                                "type_ptr" : 134
                               }
                             }
                           }
@@ -5371,7 +5415,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 130
+                          "type_ptr" : 134
                         }
                       },
                       {
@@ -5382,7 +5426,7 @@
                     ]],
                     ["ImplicitCastExpr" , [
                       {
-                        "pointer" : 190,
+                        "pointer" : 194,
                         "source_range" : [
                           {
                             "column" : 23
@@ -5395,7 +5439,7 @@
                       [
                         ["UnaryOperator" , [
                           {
-                            "pointer" : 191,
+                            "pointer" : 195,
                             "source_range" : [
                               {
                                 "column" : 23
@@ -5408,7 +5452,7 @@
                           [
                             ["DeclRefExpr" , [
                               {
-                                "pointer" : 192,
+                                "pointer" : 196,
                                 "source_range" : [
                                   {
                                     "column" : 24
@@ -5429,7 +5473,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : "Var",
-                                  "decl_pointer" : 184,
+                                  "decl_pointer" : 188,
                                   "name" : {
                                     "name" : "i",
                                     "qual_name" : [
@@ -5455,7 +5499,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 130
+                          "type_ptr" : 134
                         }
                       },
                       {
@@ -5471,10 +5515,10 @@
                     }
                   },
                   {
-                    "initializer_expr" : 187,
+                    "initializer_expr" : 191,
                     "placement_args" : [
-                      188,
-                      190
+                      192,
+                      194
                     ]
                   }
                 ]]
@@ -5482,7 +5526,7 @@
               [
                 ["VarDecl" , [
                   {
-                    "pointer" : 193,
+                    "pointer" : 197,
                     "source_range" : [
                       {
                         "column" : 3
@@ -5504,7 +5548,7 @@
                   {
                     "init_expr" : ["CXXNewExpr" , [
                       {
-                        "pointer" : 186,
+                        "pointer" : 190,
                         "source_range" : [
                           {
                             "column" : 13
@@ -5517,7 +5561,7 @@
                       [
                         ["CXXConstructExpr" , [
                           {
-                            "pointer" : 187,
+                            "pointer" : 191,
                             "source_range" : [
                               {
                                 "column" : 27
@@ -5553,7 +5597,7 @@
                         ]],
                         ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 188,
+                            "pointer" : 192,
                             "source_range" : [
                               {
                                 "column" : 18
@@ -5566,7 +5610,7 @@
                           [
                             ["DeclRefExpr" , [
                               {
-                                "pointer" : 189,
+                                "pointer" : 193,
                                 "source_range" : [
                                   {
                                     "column" : 18
@@ -5580,14 +5624,14 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 130
+                                  "type_ptr" : 134
                                 },
                                 "value_kind" : "LValue"
                               },
                               {
                                 "decl_ref" : {
                                   "kind" : "ParmVar",
-                                  "decl_pointer" : 180,
+                                  "decl_pointer" : 184,
                                   "name" : {
                                     "name" : "ptr",
                                     "qual_name" : [
@@ -5595,7 +5639,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 130
+                                    "type_ptr" : 134
                                   }
                                 }
                               }
@@ -5603,7 +5647,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 130
+                              "type_ptr" : 134
                             }
                           },
                           {
@@ -5614,7 +5658,7 @@
                         ]],
                         ["ImplicitCastExpr" , [
                           {
-                            "pointer" : 190,
+                            "pointer" : 194,
                             "source_range" : [
                               {
                                 "column" : 23
@@ -5627,7 +5671,7 @@
                           [
                             ["UnaryOperator" , [
                               {
-                                "pointer" : 191,
+                                "pointer" : 195,
                                 "source_range" : [
                                   {
                                     "column" : 23
@@ -5640,7 +5684,7 @@
                               [
                                 ["DeclRefExpr" , [
                                   {
-                                    "pointer" : 192,
+                                    "pointer" : 196,
                                     "source_range" : [
                                       {
                                         "column" : 24
@@ -5661,7 +5705,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : "Var",
-                                      "decl_pointer" : 184,
+                                      "decl_pointer" : 188,
                                       "name" : {
                                         "name" : "i",
                                         "qual_name" : [
@@ -5687,7 +5731,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 130
+                              "type_ptr" : 134
                             }
                           },
                           {
@@ -5703,10 +5747,10 @@
                         }
                       },
                       {
-                        "initializer_expr" : 187,
+                        "initializer_expr" : 191,
                         "placement_args" : [
-                          188,
-                          190
+                          192,
+                          194
                         ]
                       }
                     ]]
@@ -5720,7 +5764,7 @@
     ]],
     ["TypedefDecl" , [
       {
-        "pointer" : 194,
+        "pointer" : 198,
         "source_range" : [
           {
           },
@@ -5735,7 +5779,7 @@
           "instancetype"
         ]
       },
-      195,
+      199,
       {
       }
     ]]
@@ -5761,25 +5805,25 @@
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 196
+          "pointer" : 200
         },
         "Bool"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 197
+          "pointer" : 201
         },
         "Char_S"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 198
+          "pointer" : 202
         },
         "SChar"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 199
+          "pointer" : 203
         },
         "Short"
       ]],
@@ -5791,31 +5835,31 @@
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 200
+          "pointer" : 204
         },
         "Long"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 201
+          "pointer" : 205
         },
         "LongLong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 202
+          "pointer" : 206
         },
         "UChar"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 203
+          "pointer" : 207
         },
         "UShort"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 204
+          "pointer" : 208
         },
         "UInt"
       ]],
@@ -5827,303 +5871,303 @@
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 205
+          "pointer" : 209
         },
         "ULongLong"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 206
+          "pointer" : 210
         },
         "Float"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 207
+          "pointer" : 211
         },
         "Double"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 208
+          "pointer" : 212
         },
         "LongDouble"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 209
+          "pointer" : 213
         },
         "Float128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 210
+          "pointer" : 214
         },
         "Float16"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 211
+          "pointer" : 215
         },
         "ShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 212
+          "pointer" : 216
         },
         "Accum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 213
+          "pointer" : 217
         },
         "LongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 214
+          "pointer" : 218
         },
         "UShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 215
+          "pointer" : 219
         },
         "UAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 216
+          "pointer" : 220
         },
         "ULongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 217
+          "pointer" : 221
         },
         "ShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 218
+          "pointer" : 222
         },
         "Fract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 219
+          "pointer" : 223
         },
         "LongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 220
+          "pointer" : 224
         },
         "UShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 221
+          "pointer" : 225
         },
         "UFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 222
+          "pointer" : 226
         },
         "ULongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 223
+          "pointer" : 227
         },
         "SatShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 224
+          "pointer" : 228
         },
         "SatAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 225
+          "pointer" : 229
         },
         "SatLongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 226
+          "pointer" : 230
         },
         "SatUShortAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 227
+          "pointer" : 231
         },
         "SatUAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 228
+          "pointer" : 232
         },
         "SatULongAccum"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 229
+          "pointer" : 233
         },
         "SatShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 230
+          "pointer" : 234
         },
         "SatFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 231
+          "pointer" : 235
         },
         "SatLongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 232
+          "pointer" : 236
         },
         "SatUShortFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 233
+          "pointer" : 237
         },
         "SatUFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 234
+          "pointer" : 238
         },
         "SatULongFract"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 235
+          "pointer" : 239
         },
         "Int128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 236
+          "pointer" : 240
         },
         "UInt128"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 237
+          "pointer" : 241
         },
         "WChar_S"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 238
+          "pointer" : 242
         },
         "Char8"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 239
+          "pointer" : 243
         },
         "Char16"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 240
+          "pointer" : 244
         },
         "Char32"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 241
+          "pointer" : 245
         },
         "Dependent"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 242
+          "pointer" : 246
         },
         "Overload"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 243
+          "pointer" : 247
         },
         "BoundMember"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 244
+          "pointer" : 248
         },
         "PseudoObject"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 245
+          "pointer" : 249
         },
         "UnknownAny"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 246
+          "pointer" : 250
         },
         "ARCUnbridgedCast"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 247
+          "pointer" : 251
         },
         "BuiltinFn"
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 248
+          "pointer" : 252
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 249
+          "pointer" : 253
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 250
+          "pointer" : 254
         }
       ]],
       ["ComplexType" , [
         {
-          "pointer" : 251
+          "pointer" : 255
         }
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 252
+          "pointer" : 256
         },
         "ObjCId"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 253
+          "pointer" : 257
         },
         "ObjCClass"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 254
+          "pointer" : 258
         },
         "ObjCSel"
       ]],
       ["PointerType" , [
         {
-          "pointer" : 130
+          "pointer" : 134
         },
         {
           "type_ptr" : 100
@@ -6131,25 +6175,31 @@
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 255
+          "pointer" : 259
         },
         "NullPtr"
       ]],
       ["BuiltinType" , [
         {
-          "pointer" : 256
+          "pointer" : 260
         },
         "Half"
       ]],
+      ["BuiltinType" , [
+        {
+          "pointer" : 261
+        },
+        "BFloat16"
+      ]],
       ["RecordType" , [
         {
-          "pointer" : 257
+          "pointer" : 262
         },
-        258
+        263
       ]],
       ["PointerType" , [
         {
-          "pointer" : 259
+          "pointer" : 264
         },
         {
           "type_ptr" : 11,
@@ -6158,34 +6208,34 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 260
+          "pointer" : 265
         },
         {
-          "type_ptr" : 197,
+          "type_ptr" : 201,
           "is_const" : true
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 261
+          "pointer" : 266
         },
         {
-          "type_ptr" : 197
+          "type_ptr" : 201
         }
       ]],
       ["RecordType" , [
         {
-          "pointer" : 262
+          "pointer" : 267
         },
-        263
+        268
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 264
+          "pointer" : 269
         },
         {
           "element_type" : {
-            "type_ptr" : 262
+            "type_ptr" : 267
           },
           "stride" : 24
         },
@@ -6245,7 +6295,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 265
+          "pointer" : 270
         },
         {
           "return_type" : {
@@ -6266,7 +6316,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 266
+          "pointer" : 271
         },
         {
           "return_type" : {
@@ -6308,7 +6358,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 267
+          "pointer" : 272
         },
         {
           "return_type" : {
@@ -6354,10 +6404,10 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 268
+          "pointer" : 273
         },
         {
-          "type_ptr" : 269
+          "type_ptr" : 274
         }
       ]],
       ["PointerType" , [
@@ -6370,11 +6420,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 121
+          "pointer" : 123
         },
         {
           "return_type" : {
-            "type_ptr" : 130
+            "type_ptr" : 134
           }
         },
         {
@@ -6387,7 +6437,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 179
+          "pointer" : 183
         },
         {
           "return_type" : {
@@ -6397,14 +6447,14 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 128
+          "pointer" : 132
         },
         {
           "return_type" : {
@@ -6414,35 +6464,35 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             }
           ]
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 270
+          "pointer" : 275
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 271
+          "pointer" : 276
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 272
+          "pointer" : 277
         },
         {
-          "type_ptr" : 270
+          "type_ptr" : 275
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 273
+          "pointer" : 278
         },
         {
-          "type_ptr" : 271
+          "type_ptr" : 276
         }
       ]],
       ["AutoType" , [
@@ -6461,7 +6511,7 @@
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 274
+          "pointer" : 279
         },
         {
           "element_type" : {
@@ -6473,15 +6523,15 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 275
+          "pointer" : 280
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 276
+          "pointer" : 281
         },
         {
-          "type_ptr" : 275
+          "type_ptr" : 280
         }
       ]],
       ["PointerType" , [
@@ -6494,15 +6544,15 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 277
+          "pointer" : 282
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 278
+          "pointer" : 283
         },
         {
-          "type_ptr" : 277
+          "type_ptr" : 282
         }
       ]],
       ["AutoType" , [
@@ -6533,7 +6583,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 279
+          "pointer" : 284
         },
         {
           "return_type" : {
@@ -6545,15 +6595,15 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 280
+          "pointer" : 285
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 281
+          "pointer" : 286
         },
         {
-          "type_ptr" : 280
+          "type_ptr" : 285
         }
       ]],
       ["LValueReferenceType" , [
@@ -6567,7 +6617,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 282
+          "pointer" : 287
         },
         {
           "return_type" : {
@@ -6609,7 +6659,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 283
+          "pointer" : 288
         },
         {
           "return_type" : {
@@ -6643,15 +6693,15 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 284
+          "pointer" : 289
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 285
+          "pointer" : 290
         },
         {
-          "type_ptr" : 284
+          "type_ptr" : 289
         }
       ]],
       ["AutoType" , [
@@ -6682,7 +6732,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 286
+          "pointer" : 291
         },
         {
           "return_type" : {
@@ -6694,20 +6744,20 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 287
+          "pointer" : 292
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 288
+          "pointer" : 293
         },
         {
-          "type_ptr" : 287
+          "type_ptr" : 292
         }
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 144
+          "pointer" : 148
         },
         {
           "element_type" : {
@@ -6719,33 +6769,33 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 289
+          "pointer" : 294
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 290
+          "pointer" : 295
         },
         {
-          "type_ptr" : 289
+          "type_ptr" : 294
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 291
+          "pointer" : 296
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 292
+          "pointer" : 297
         },
         {
-          "type_ptr" : 291
+          "type_ptr" : 296
         }
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 166
+          "pointer" : 170
         },
         {
           "element_type" : {
@@ -6757,24 +6807,24 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 293
+          "pointer" : 298
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 294
+          "pointer" : 299
         },
         {
-          "type_ptr" : 293
+          "type_ptr" : 298
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 295
+          "pointer" : 300
         },
         {
           "return_type" : {
-            "type_ptr" : 130
+            "type_ptr" : 134
           }
         },
         {
@@ -6783,21 +6833,21 @@
               "type_ptr" : 67
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 169
+          "pointer" : 173
         },
         {
           "return_type" : {
-            "type_ptr" : 130
+            "type_ptr" : 134
           }
         },
         {
@@ -6806,17 +6856,17 @@
               "type_ptr" : 67
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 296
+          "pointer" : 301
         },
         {
           "return_type" : {
@@ -6826,68 +6876,68 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             }
           ]
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 297
+          "pointer" : 302
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 298
+          "pointer" : 303
         },
         {
-          "type_ptr" : 297
+          "type_ptr" : 302
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 299
+          "pointer" : 304
         },
         {
-          "base_type" : 252
+          "base_type" : 256
         }
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 300
+          "pointer" : 305
         },
         {
-          "type_ptr" : 299
+          "type_ptr" : 304
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 301,
-          "desugared_type" : 300
+          "pointer" : 306,
+          "desugared_type" : 305
         },
         {
           "child_type" : {
-            "type_ptr" : 300
+            "type_ptr" : 305
           },
-          "decl_ptr" : 302
+          "decl_ptr" : 307
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 195,
-          "desugared_type" : 300
+          "pointer" : 199,
+          "desugared_type" : 305
         },
         {
           "child_type" : {
-            "type_ptr" : 301
+            "type_ptr" : 306
           },
-          "decl_ptr" : 194
+          "decl_ptr" : 198
         }
       ]],
       ["NoneType" , [
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/no_except_expr.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/no_except_expr.cpp.exp
index 0dbb96a6a..6929934a3 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/no_except_expr.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/no_except_expr.cpp.exp
@@ -781,15 +781,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 88
         },
-        89
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 89
+        },
+        90
       ]],
       ["PointerType" , [
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "type_ptr" : 23,
@@ -798,7 +804,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 91
+          "pointer" : 92
         },
         {
           "type_ptr" : 26,
@@ -807,7 +813,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 92
+          "pointer" : 93
         },
         {
           "type_ptr" : 26
@@ -815,17 +821,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 93
+          "pointer" : 94
         },
-        94
+        95
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 95
+          "pointer" : 96
         },
         {
           "element_type" : {
-            "type_ptr" : 93
+            "type_ptr" : 94
           },
           "stride" : 24
         },
@@ -833,7 +839,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 96
+          "pointer" : 97
         },
         {
           "return_type" : {
@@ -869,18 +875,18 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 97
+          "pointer" : 98
         },
         {
-          "type_ptr" : 92
+          "type_ptr" : 93
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 98
+          "pointer" : 99
         },
         {
-          "type_ptr" : 96
+          "type_ptr" : 97
         }
       ]],
       ["PointerType" , [
@@ -893,7 +899,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 99
+          "pointer" : 100
         },
         {
           "base_type" : 82
@@ -901,32 +907,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 100
+          "pointer" : 101
         },
         {
-          "type_ptr" : 99
+          "type_ptr" : 100
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 101,
-          "desugared_type" : 100
+          "pointer" : 102,
+          "desugared_type" : 101
         },
         {
           "child_type" : {
-            "type_ptr" : 100
+            "type_ptr" : 101
           },
-          "decl_ptr" : 102
+          "decl_ptr" : 103
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 25,
-          "desugared_type" : 100
+          "desugared_type" : 101
         },
         {
           "child_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 102
           },
           "decl_ptr" : 24
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/objcpp_template_unboxing.mm.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/objcpp_template_unboxing.mm.exp
index 4b5acb0fd..efc9f5ed7 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/objcpp_template_unboxing.mm.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/objcpp_template_unboxing.mm.exp
@@ -650,17 +650,23 @@
         },
         "Half"
       ]],
-      ["PointerType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 80
         },
+        "BFloat16"
+      ]],
+      ["PointerType" , [
+        {
+          "pointer" : 81
+        },
         {
           "type_ptr" : 76
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 81
+          "pointer" : 82
         },
         {
           "base_type" : 74
@@ -668,15 +674,15 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 82
+          "pointer" : 83
         },
         {
-          "type_ptr" : 81
+          "type_ptr" : 82
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 83
+          "pointer" : 84
         },
         {
           "base_type" : 75
@@ -684,27 +690,27 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
-          "type_ptr" : 83
+          "type_ptr" : 84
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 85
+          "pointer" : 86
         },
         8
       ]],
       ["RecordType" , [
         {
-          "pointer" : 86
+          "pointer" : 87
         },
-        87
+        88
       ]],
       ["PointerType" , [
         {
-          "pointer" : 88
+          "pointer" : 89
         },
         {
           "type_ptr" : 20,
@@ -713,7 +719,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
           "type_ptr" : 17,
@@ -722,7 +728,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "type_ptr" : 17
@@ -730,17 +736,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 91
+          "pointer" : 92
         },
-        92
+        93
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 93
+          "pointer" : 94
         },
         {
           "element_type" : {
-            "type_ptr" : 91
+            "type_ptr" : 92
           },
           "stride" : 24
         },
@@ -748,17 +754,17 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 94
+          "pointer" : 95
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 95
+          "pointer" : 96
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 96
+          "pointer" : 97
         },
         {
           "return_type" : {
@@ -768,14 +774,14 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 94
+              "type_ptr" : 95
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 97
+          "pointer" : 98
         },
         {
           "return_type" : {
@@ -785,7 +791,7 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 95
+              "type_ptr" : 96
             }
           ]
         }
@@ -793,11 +799,11 @@
       ["TypedefType" , [
         {
           "pointer" : 6,
-          "desugared_type" : 82
+          "desugared_type" : 83
         },
         {
           "child_type" : {
-            "type_ptr" : 82
+            "type_ptr" : 83
           },
           "decl_ptr" : 5
         }
@@ -805,7 +811,7 @@
       ["TypedefType" , [
         {
           "pointer" : 14,
-          "desugared_type" : 82
+          "desugared_type" : 83
         },
         {
           "child_type" : {
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/optional.m.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/optional.m.exp
index f18319c28..1a20402d0 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/optional.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/optional.m.exp
@@ -1937,17 +1937,23 @@
         },
         "Half"
       ]],
-      ["PointerType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 113
         },
+        "BFloat16"
+      ]],
+      ["PointerType" , [
+        {
+          "pointer" : 114
+        },
         {
           "type_ptr" : 109
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 114
+          "pointer" : 115
         },
         {
           "base_type" : 107
@@ -1955,15 +1961,15 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 115
+          "pointer" : 116
         },
         {
-          "type_ptr" : 114
+          "type_ptr" : 115
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 116
+          "pointer" : 117
         },
         {
           "base_type" : 108
@@ -1971,27 +1977,27 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 117
+          "pointer" : 118
         },
         {
-          "type_ptr" : 116
+          "type_ptr" : 117
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 118
+          "pointer" : 119
         },
         9
       ]],
       ["RecordType" , [
         {
-          "pointer" : 119
+          "pointer" : 120
         },
-        120
+        121
       ]],
       ["PointerType" , [
         {
-          "pointer" : 121
+          "pointer" : 122
         },
         {
           "type_ptr" : 56,
@@ -2000,7 +2006,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 122
+          "pointer" : 123
         },
         {
           "type_ptr" : 53,
@@ -2009,7 +2015,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 123
+          "pointer" : 124
         },
         {
           "type_ptr" : 53
@@ -2017,17 +2023,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 124
+          "pointer" : 125
         },
-        125
+        126
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 126
+          "pointer" : 127
         },
         {
           "element_type" : {
-            "type_ptr" : 124
+            "type_ptr" : 125
           },
           "stride" : 24
         },
@@ -2035,18 +2041,18 @@
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 127
+          "pointer" : 128
         },
         13
       ]],
       ["TypedefType" , [
         {
           "pointer" : 7,
-          "desugared_type" : 115
+          "desugared_type" : 116
         },
         {
           "child_type" : {
-            "type_ptr" : 115
+            "type_ptr" : 116
           },
           "decl_ptr" : 6
         }
@@ -2054,7 +2060,7 @@
       ["TypedefType" , [
         {
           "pointer" : 51,
-          "desugared_type" : 115
+          "desugared_type" : 116
         },
         {
           "child_type" : {
@@ -2066,24 +2072,24 @@
       ["TypedefType" , [
         {
           "pointer" : 5,
-          "desugared_type" : 113
+          "desugared_type" : 114
         },
         {
           "child_type" : {
-            "type_ptr" : 113
+            "type_ptr" : 114
           },
           "decl_ptr" : 4
         }
       ]],
       ["ObjCInterfaceType" , [
         {
-          "pointer" : 128
+          "pointer" : 129
         },
         20
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 129
+          "pointer" : 130
         },
         {
           "base_type" : 107,
@@ -2097,7 +2103,7 @@
           "pointer" : 22
         },
         {
-          "type_ptr" : 129
+          "type_ptr" : 130
         }
       ]],
       ["ObjCObjectPointerType" , [
@@ -2105,7 +2111,7 @@
           "pointer" : 27
         },
         {
-          "type_ptr" : 128
+          "type_ptr" : 129
         }
       ]],
       ["NoneType" , [
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/sizeof_static_evaluation.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/sizeof_static_evaluation.cpp.exp
index 4e37954ea..f377d84da 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/sizeof_static_evaluation.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/sizeof_static_evaluation.cpp.exp
@@ -318,7 +318,7 @@
             "type_ptr" : 19
           },
           {
-            "mangled_name" : "800005863435481739",
+            "mangled_name" : "2670522532645241414",
             "is_cpp" : true,
             "decl_ptr_with_body" : 18,
             "body" : ["CompoundStmt" , [
@@ -351,7 +351,7 @@
       },
       {
       },
-      "2204753185921246810",
+      "",
       {
         "template_decl" : 7,
         "specialization_args" : [
@@ -862,15 +862,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 90
         },
-        91
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 91
+        },
+        92
       ]],
       ["PointerType" , [
         {
-          "pointer" : 92
+          "pointer" : 93
         },
         {
           "type_ptr" : 12,
@@ -879,7 +885,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 93
+          "pointer" : 94
         },
         {
           "type_ptr" : 25,
@@ -888,7 +894,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 94
+          "pointer" : 95
         },
         {
           "type_ptr" : 25
@@ -896,17 +902,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 95
+          "pointer" : 96
         },
-        96
+        97
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 97
+          "pointer" : 98
         },
         {
           "element_type" : {
-            "type_ptr" : 95
+            "type_ptr" : 96
           },
           "stride" : 24
         },
@@ -919,22 +925,22 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 98
+          "pointer" : 99
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 99
+          "pointer" : 100
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 100
+          "pointer" : 101
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 101
+          "pointer" : 102
         }
       ]],
       ["TemplateTypeParmType" , [
@@ -944,12 +950,12 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 102
+          "pointer" : 103
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 103
+          "pointer" : 104
         }
       ]],
       ["InjectedClassNameType" , [
@@ -959,12 +965,12 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 104
+          "pointer" : 105
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 105
+          "pointer" : 106
         },
         {
           "type_ptr" : 9
@@ -984,7 +990,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 106
+          "pointer" : 107
         },
         {
           "base_type" : 84
@@ -992,32 +998,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 107
+          "pointer" : 108
         },
         {
-          "type_ptr" : 106
+          "type_ptr" : 107
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 108,
-          "desugared_type" : 107
+          "pointer" : 109,
+          "desugared_type" : 108
         },
         {
           "child_type" : {
-            "type_ptr" : 107
+            "type_ptr" : 108
           },
-          "decl_ptr" : 109
+          "decl_ptr" : 110
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 27,
-          "desugared_type" : 107
+          "desugared_type" : 108
         },
         {
           "child_type" : {
-            "type_ptr" : 108
+            "type_ptr" : 109
           },
           "decl_ptr" : 26
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/struct.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/struct.cpp.exp
index 114884cfd..800af6e3e 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/struct.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/struct.cpp.exp
@@ -386,7 +386,7 @@
                         "type_ptr" : 21
                       },
                       {
-                        "mangled_name" : "4417717915555375243",
+                        "mangled_name" : "6288234584765134918",
                         "is_cpp" : true,
                         "is_inline" : true,
                         "decl_ptr_with_body" : 20,
@@ -437,7 +437,7 @@
                         "type_ptr" : 24
                       },
                       {
-                        "mangled_name" : "4190573168950999278",
+                        "mangled_name" : "5359255322723102949",
                         "is_cpp" : true,
                         "is_inline" : true,
                         "parameters" : [
@@ -499,7 +499,7 @@
                         "type_ptr" : 28
                       },
                       {
-                        "mangled_name" : "12437859369676964978",
+                        "mangled_name" : "18224946875082286891",
                         "is_cpp" : true,
                         "is_inline" : true,
                         "parameters" : [
@@ -1461,15 +1461,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 115
         },
-        116
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 116
+        },
+        117
       ]],
       ["PointerType" , [
         {
-          "pointer" : 117
+          "pointer" : 118
         },
         {
           "type_ptr" : 42,
@@ -1478,7 +1484,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 118
+          "pointer" : 119
         },
         {
           "type_ptr" : 54,
@@ -1487,7 +1493,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 119
+          "pointer" : 120
         },
         {
           "type_ptr" : 54
@@ -1495,17 +1501,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 120
+          "pointer" : 121
         },
-        121
+        122
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 122
+          "pointer" : 123
         },
         {
           "element_type" : {
-            "type_ptr" : 120
+            "type_ptr" : 121
           },
           "stride" : 24
         },
@@ -1537,7 +1543,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 123
+          "pointer" : 124
         },
         {
           "return_type" : {
@@ -1558,7 +1564,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 124
+          "pointer" : 125
         },
         {
           "return_type" : {
@@ -1600,7 +1606,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 125
+          "pointer" : 126
         },
         {
           "return_type" : {
@@ -1658,7 +1664,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 126
+          "pointer" : 127
         },
         {
           "base_type" : 109
@@ -1666,32 +1672,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 127
+          "pointer" : 128
         },
         {
-          "type_ptr" : 126
+          "type_ptr" : 127
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 128,
-          "desugared_type" : 127
+          "pointer" : 129,
+          "desugared_type" : 128
         },
         {
           "child_type" : {
-            "type_ptr" : 127
+            "type_ptr" : 128
           },
-          "decl_ptr" : 129
+          "decl_ptr" : 130
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 51,
-          "desugared_type" : 127
+          "desugared_type" : 128
         },
         {
           "child_type" : {
-            "type_ptr" : 128
+            "type_ptr" : 129
           },
           "decl_ptr" : 50
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/template_instantiations.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/template_instantiations.cpp.exp
index 9b1afcdc1..51de7430f 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/template_instantiations.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/template_instantiations.cpp.exp
@@ -169,7 +169,7 @@
             },
             {
             },
-            "2296961816144140105",
+            "",
             {
               "template_decl" : 7,
               "specialization_args" : [
@@ -266,7 +266,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "16263929779680628849",
+                  "mangled_name" : "15507823120941368224",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 14,
@@ -316,7 +316,7 @@
                   "type_ptr" : 18
                 },
                 {
-                  "mangled_name" : "11014497521477142187",
+                  "mangled_name" : "651618469270041090",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -377,7 +377,7 @@
                   "type_ptr" : 22
                 },
                 {
-                  "mangled_name" : "15031955784438883279",
+                  "mangled_name" : "14649822005097330172",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -423,7 +423,7 @@
             {
               "is_pod" : true
             },
-            "8342447397680512296",
+            "",
             {
               "template_decl" : 7,
               "specialization_args" : [
@@ -631,7 +631,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "10023818314310534501",
+                  "mangled_name" : "9282946488688737892",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 34,
@@ -681,7 +681,7 @@
                   "type_ptr" : 37
                 },
                 {
-                  "mangled_name" : "11471169980769644070",
+                  "mangled_name" : "4835163870722214719",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -742,7 +742,7 @@
                   "type_ptr" : 41
                 },
                 {
-                  "mangled_name" : "11154857410366551354",
+                  "mangled_name" : "14658047667100730153",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -788,7 +788,7 @@
             {
               "is_pod" : true
             },
-            "11141543725649308068",
+            "",
             {
               "template_decl" : 30,
               "specialization_args" : [
@@ -968,7 +968,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "1478228132453016226",
+                  "mangled_name" : "18054455536952808167",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 51,
@@ -1018,7 +1018,7 @@
                   "type_ptr" : 54
                 },
                 {
-                  "mangled_name" : "11043804702208708385",
+                  "mangled_name" : "12602934757794480668",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1079,7 +1079,7 @@
                   "type_ptr" : 58
                 },
                 {
-                  "mangled_name" : "5185260157533638819",
+                  "mangled_name" : "3579925925305368200",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1125,7 +1125,7 @@
             {
               "is_pod" : true
             },
-            "18441911275316219119",
+            "",
             {
               "template_decl" : 47,
               "specialization_args" : [
@@ -1243,7 +1243,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "16225353893069217924",
+                  "mangled_name" : "16721342488904302213",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 65,
@@ -1293,7 +1293,7 @@
                   "type_ptr" : 68
                 },
                 {
-                  "mangled_name" : "16636418989297388895",
+                  "mangled_name" : "6201193260347400774",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1354,7 +1354,7 @@
                   "type_ptr" : 72
                 },
                 {
-                  "mangled_name" : "2774670671732909065",
+                  "mangled_name" : "17328475686832768154",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1400,7 +1400,7 @@
             {
               "is_pod" : true
             },
-            "7893038887469539829",
+            "",
             {
               "template_decl" : 61,
               "specialization_args" : [
@@ -1518,7 +1518,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "16125716847522929195",
+                  "mangled_name" : "17996233516732688870",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 79,
@@ -1568,7 +1568,7 @@
                   "type_ptr" : 82
                 },
                 {
-                  "mangled_name" : "5156418638880841616",
+                  "mangled_name" : "8170411964911509925",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1629,7 +1629,7 @@
                   "type_ptr" : 86
                 },
                 {
-                  "mangled_name" : "18073023600850944380",
+                  "mangled_name" : "16625409861663294039",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1675,7 +1675,7 @@
             {
               "is_pod" : true
             },
-            "6282617124311682814",
+            "",
             {
               "template_decl" : 75,
               "specialization_args" : [
@@ -1979,7 +1979,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "8438636393447290261",
+                  "mangled_name" : "7942647797612205972",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 102,
@@ -2029,7 +2029,7 @@
                   "type_ptr" : 105
                 },
                 {
-                  "mangled_name" : "304459608885830774",
+                  "mangled_name" : "13792914784228561871",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -2090,7 +2090,7 @@
                   "type_ptr" : 109
                 },
                 {
-                  "mangled_name" : "5555169503117312650",
+                  "mangled_name" : "6395019852822673209",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -2136,7 +2136,7 @@
             {
               "is_pod" : true
             },
-            "92945586264616176",
+            "",
             {
               "template_decl" : 98,
               "specialization_args" : [
@@ -2260,7 +2260,7 @@
             "type_ptr" : 15
           },
           {
-            "mangled_name" : "14898916407379161639",
+            "mangled_name" : "16769433076588921314",
             "is_cpp" : true,
             "is_inline" : true,
             "decl_ptr_with_body" : 117,
@@ -2310,7 +2310,7 @@
             "type_ptr" : 120
           },
           {
-            "mangled_name" : "7125450473324676530",
+            "mangled_name" : "18119742553314115417",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -2371,7 +2371,7 @@
             "type_ptr" : 124
           },
           {
-            "mangled_name" : "3069361207223136310",
+            "mangled_name" : "14901405322990444079",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -2458,7 +2458,7 @@
             {
               "name" : "Z",
               "qual_name" : [
-                "Z<&y>"
+                "Z<y>"
               ]
             },
             129,
@@ -2482,7 +2482,7 @@
                   "name" : "Z",
                   "qual_name" : [
                     "Z",
-                    "Z<&y>"
+                    "Z<y>"
                   ]
                 },
                 129,
@@ -2518,14 +2518,14 @@
                   "name" : "Z",
                   "qual_name" : [
                     "Z",
-                    "Z<&y>"
+                    "Z<y>"
                   ]
                 },
                 {
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "2247315131692507250",
+                  "mangled_name" : "499240077376103735",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 131,
@@ -2568,14 +2568,14 @@
                   "name" : "Z",
                   "qual_name" : [
                     "Z",
-                    "Z<&y>"
+                    "Z<y>"
                   ]
                 },
                 {
                   "type_ptr" : 134
                 },
                 {
-                  "mangled_name" : "7738251501016099665",
+                  "mangled_name" : "17768891565958800780",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -2629,14 +2629,14 @@
                   "name" : "Z",
                   "qual_name" : [
                     "Z",
-                    "Z<&y>"
+                    "Z<y>"
                   ]
                 },
                 {
                   "type_ptr" : 138
                 },
                 {
-                  "mangled_name" : "15832834678910379731",
+                  "mangled_name" : "5257127409284049912",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -2682,7 +2682,7 @@
             {
               "is_pod" : true
             },
-            "4282980438553401163",
+            "",
             {
               "template_decl" : 127,
               "specialization_args" : [
@@ -2797,7 +2797,7 @@
             {
               "name" : "W",
               "qual_name" : [
-                "W<&b>"
+                "W<b>"
               ]
             },
             145,
@@ -2821,7 +2821,7 @@
                   "name" : "W",
                   "qual_name" : [
                     "W",
-                    "W<&b>"
+                    "W<b>"
                   ]
                 },
                 145,
@@ -2857,14 +2857,14 @@
                   "name" : "W",
                   "qual_name" : [
                     "W",
-                    "W<&b>"
+                    "W<b>"
                   ]
                 },
                 {
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "7772438286950717212",
+                  "mangled_name" : "8268180592181082237",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 147,
@@ -2907,14 +2907,14 @@
                   "name" : "W",
                   "qual_name" : [
                     "W",
-                    "W<&b>"
+                    "W<b>"
                   ]
                 },
                 {
                   "type_ptr" : 150
                 },
                 {
-                  "mangled_name" : "10597356402107300951",
+                  "mangled_name" : "15184425556926585790",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -2968,14 +2968,14 @@
                   "name" : "W",
                   "qual_name" : [
                     "W",
-                    "W<&b>"
+                    "W<b>"
                   ]
                 },
                 {
                   "type_ptr" : 154
                 },
                 {
-                  "mangled_name" : "9048930144420503889",
+                  "mangled_name" : "2251022854406196514",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -3021,7 +3021,7 @@
             {
               "is_pod" : true
             },
-            "632323835311287041",
+            "",
             {
               "template_decl" : 143,
               "specialization_args" : [
@@ -3223,7 +3223,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "3658993291457928989",
+                  "mangled_name" : "3162969511250741948",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 166,
@@ -3273,7 +3273,7 @@
                   "type_ptr" : 169
                 },
                 {
-                  "mangled_name" : "18252192508176638302",
+                  "mangled_name" : "943561519717330679",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -3334,7 +3334,7 @@
                   "type_ptr" : 173
                 },
                 {
-                  "mangled_name" : "9481628931273708930",
+                  "mangled_name" : "16348915219842036529",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -3380,7 +3380,7 @@
             {
               "is_pod" : true
             },
-            "6648620333758562824",
+            "",
             {
               "template_decl" : 162,
               "specialization_args" : [
@@ -3504,7 +3504,7 @@
                 "name" : "Z",
                 "qual_name" : [
                   "Z",
-                  "Z<&y>"
+                  "Z<y>"
                 ]
               },
               "qual_type" : {
@@ -3566,7 +3566,7 @@
                 "name" : "W",
                 "qual_name" : [
                   "W",
-                  "W<&b>"
+                  "W<b>"
                 ]
               },
               "qual_type" : {
@@ -4062,15 +4062,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 254
         },
-        255
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 255
+        },
+        256
       ]],
       ["PointerType" , [
         {
-          "pointer" : 256
+          "pointer" : 257
         },
         {
           "type_ptr" : 10,
@@ -4079,7 +4085,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 257
+          "pointer" : 258
         },
         {
           "type_ptr" : 192,
@@ -4088,7 +4094,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 258
+          "pointer" : 259
         },
         {
           "type_ptr" : 192
@@ -4096,17 +4102,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 259
+          "pointer" : 260
         },
-        260
+        261
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 261
+          "pointer" : 262
         },
         {
           "element_type" : {
-            "type_ptr" : 259
+            "type_ptr" : 260
           },
           "stride" : 24
         },
@@ -4114,37 +4120,37 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 262
+          "pointer" : 263
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 263
+          "pointer" : 264
         }
       ]],
       ["PackExpansionType" , [
         {
-          "pointer" : 264
+          "pointer" : 265
         }
       ]],
       ["PackExpansionType" , [
         {
-          "pointer" : 265
+          "pointer" : 266
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 266
+          "pointer" : 267
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 267
+          "pointer" : 268
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 268
+          "pointer" : 269
         }
       ]],
       ["RecordType" , [
@@ -4155,7 +4161,7 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 269,
+          "pointer" : 270,
           "desugared_type" : 9
         }
       ]],
@@ -4173,7 +4179,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 270
+          "pointer" : 271
         },
         {
           "return_type" : {
@@ -4185,7 +4191,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 271
+          "pointer" : 272
         },
         {
           "return_type" : {
@@ -4206,7 +4212,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 272
+          "pointer" : 273
         },
         {
           "return_type" : {
@@ -4248,7 +4254,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 273
+          "pointer" : 274
         },
         {
           "return_type" : {
@@ -4294,7 +4300,7 @@
       ]],
       ["DecltypeType" , [
         {
-          "pointer" : 274,
+          "pointer" : 275,
           "desugared_type" : 252
         },
         {
@@ -4308,24 +4314,24 @@
         },
         {
           "child_type" : {
-            "type_ptr" : 274
+            "type_ptr" : 275
           },
           "decl_ptr" : 28
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 275
+          "pointer" : 276
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 276
+          "pointer" : 277
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 277
+          "pointer" : 278
         }
       ]],
       ["RecordType" , [
@@ -4342,7 +4348,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 278
+          "pointer" : 279
         },
         {
           "return_type" : {
@@ -4363,7 +4369,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 279
+          "pointer" : 280
         },
         {
           "return_type" : {
@@ -4405,7 +4411,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 280
+          "pointer" : 281
         },
         {
           "return_type" : {
@@ -4439,47 +4445,47 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 281
+          "pointer" : 282
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 282
+          "pointer" : 283
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 283
+          "pointer" : 284
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 284
+          "pointer" : 285
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 285
+          "pointer" : 286
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 286
+          "pointer" : 287
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 287
+          "pointer" : 288
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 288
+          "pointer" : 289
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 289
+          "pointer" : 290
         }
       ]],
       ["RecordType" , [
@@ -4496,7 +4502,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 290
+          "pointer" : 291
         },
         {
           "return_type" : {
@@ -4517,7 +4523,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 291
+          "pointer" : 292
         },
         {
           "return_type" : {
@@ -4559,7 +4565,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 292
+          "pointer" : 293
         },
         {
           "return_type" : {
@@ -4605,7 +4611,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 293
+          "pointer" : 294
         },
         {
           "return_type" : {
@@ -4626,7 +4632,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 294
+          "pointer" : 295
         },
         {
           "return_type" : {
@@ -4668,7 +4674,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 295
+          "pointer" : 296
         },
         {
           "return_type" : {
@@ -4714,7 +4720,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 296
+          "pointer" : 297
         },
         {
           "return_type" : {
@@ -4735,7 +4741,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 297
+          "pointer" : 298
         },
         {
           "return_type" : {
@@ -4777,7 +4783,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 298
+          "pointer" : 299
         },
         {
           "return_type" : {
@@ -4811,17 +4817,17 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 299
+          "pointer" : 300
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 300
+          "pointer" : 301
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 301
+          "pointer" : 302
         }
       ]],
       ["ConstantArrayType" , [
@@ -4853,22 +4859,22 @@
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 302
+          "pointer" : 303
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 303
+          "pointer" : 304
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 304
+          "pointer" : 305
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 305
+          "pointer" : 306
         },
         {
           "return_type" : {
@@ -4880,7 +4886,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 306
+          "pointer" : 307
         },
         {
           "return_type" : {
@@ -4922,7 +4928,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 307
+          "pointer" : 308
         },
         {
           "return_type" : {
@@ -4968,7 +4974,7 @@
       ]],
       ["ParenType" , [
         {
-          "pointer" : 308,
+          "pointer" : 309,
           "desugared_type" : 158
         },
         {
@@ -4977,7 +4983,7 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 309
+          "pointer" : 310
         },
         {
           "type_ptr" : 158
@@ -4985,25 +4991,25 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 310
+          "pointer" : 311
         },
         {
-          "type_ptr" : 308
+          "type_ptr" : 309
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 311
+          "pointer" : 312
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 312
+          "pointer" : 313
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 313
+          "pointer" : 314
         }
       ]],
       ["FunctionProtoType" , [
@@ -5025,7 +5031,7 @@
       ]],
       ["ParenType" , [
         {
-          "pointer" : 314,
+          "pointer" : 315,
           "desugared_type" : 160
         },
         {
@@ -5034,7 +5040,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 315
+          "pointer" : 316
         },
         {
           "type_ptr" : 160
@@ -5042,30 +5048,30 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 316
+          "pointer" : 317
         },
         {
-          "type_ptr" : 314
+          "type_ptr" : 315
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 317
+          "pointer" : 318
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 318
+          "pointer" : 319
         }
       ]],
       ["InjectedClassNameType" , [
         {
-          "pointer" : 319
+          "pointer" : 320
         }
       ]],
       ["PointerType" , [
         {
-          "pointer" : 320
+          "pointer" : 321
         },
         {
           "type_ptr" : 10
@@ -5085,7 +5091,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 321
+          "pointer" : 322
         },
         {
           "return_type" : {
@@ -5106,7 +5112,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 322
+          "pointer" : 323
         },
         {
           "return_type" : {
@@ -5148,7 +5154,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 323
+          "pointer" : 324
         },
         {
           "return_type" : {
@@ -5194,7 +5200,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 324
+          "pointer" : 325
         },
         {
           "return_type" : {
@@ -5215,7 +5221,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 325
+          "pointer" : 326
         },
         {
           "return_type" : {
@@ -5257,7 +5263,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 326
+          "pointer" : 327
         },
         {
           "return_type" : {
@@ -5303,7 +5309,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 327
+          "pointer" : 328
         },
         {
           "return_type" : {
@@ -5324,7 +5330,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 328
+          "pointer" : 329
         },
         {
           "return_type" : {
@@ -5366,7 +5372,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 329
+          "pointer" : 330
         },
         {
           "return_type" : {
@@ -5412,7 +5418,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 330
+          "pointer" : 331
         },
         {
           "return_type" : {
@@ -5433,7 +5439,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 331
+          "pointer" : 332
         },
         {
           "return_type" : {
@@ -5475,7 +5481,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 332
+          "pointer" : 333
         },
         {
           "return_type" : {
@@ -5509,7 +5515,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 333
+          "pointer" : 334
         },
         {
           "base_type" : 248
@@ -5517,32 +5523,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 334
+          "pointer" : 335
         },
         {
-          "type_ptr" : 333
+          "type_ptr" : 334
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 335,
-          "desugared_type" : 334
+          "pointer" : 336,
+          "desugared_type" : 335
         },
         {
           "child_type" : {
-            "type_ptr" : 334
+            "type_ptr" : 335
           },
-          "decl_ptr" : 336
+          "decl_ptr" : 337
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 189,
-          "desugared_type" : 334
+          "desugared_type" : 335
         },
         {
           "child_type" : {
-            "type_ptr" : 335
+            "type_ptr" : 336
           },
           "decl_ptr" : 188
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/this.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/this.cpp.exp
index 5b128d533..738c8aec9 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/this.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/this.cpp.exp
@@ -799,15 +799,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 86
         },
-        87
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 87
+        },
+        88
       ]],
       ["PointerType" , [
         {
-          "pointer" : 88
+          "pointer" : 89
         },
         {
           "type_ptr" : 11,
@@ -816,7 +822,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
           "type_ptr" : 24,
@@ -825,7 +831,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "type_ptr" : 24
@@ -833,17 +839,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 91
+          "pointer" : 92
         },
-        92
+        93
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 93
+          "pointer" : 94
         },
         {
           "element_type" : {
-            "type_ptr" : 91
+            "type_ptr" : 92
           },
           "stride" : 24
         },
@@ -877,7 +883,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 94
+          "pointer" : 95
         },
         {
           "base_type" : 80
@@ -885,32 +891,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 95
+          "pointer" : 96
         },
         {
-          "type_ptr" : 94
+          "type_ptr" : 95
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 96,
-          "desugared_type" : 95
+          "pointer" : 97,
+          "desugared_type" : 96
         },
         {
           "child_type" : {
-            "type_ptr" : 95
+            "type_ptr" : 96
           },
-          "decl_ptr" : 97
+          "decl_ptr" : 98
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 21,
-          "desugared_type" : 95
+          "desugared_type" : 96
         },
         {
           "child_type" : {
-            "type_ptr" : 96
+            "type_ptr" : 97
           },
           "decl_ptr" : 20
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/type_trait.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/type_trait.cpp.exp
index b6961c4a2..4796dcf98 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/type_trait.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/type_trait.cpp.exp
@@ -372,7 +372,7 @@
             "type_ptr" : 22
           },
           {
-            "mangled_name" : "9850251229546392500",
+            "mangled_name" : "10975959821506117086",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -1275,15 +1275,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 109
         },
-        110
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 110
+        },
+        111
       ]],
       ["PointerType" , [
         {
-          "pointer" : 111
+          "pointer" : 112
         },
         {
           "type_ptr" : 30,
@@ -1292,7 +1298,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 112
+          "pointer" : 113
         },
         {
           "type_ptr" : 47,
@@ -1301,7 +1307,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 113
+          "pointer" : 114
         },
         {
           "type_ptr" : 47
@@ -1309,17 +1315,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 114
+          "pointer" : 115
         },
-        115
+        116
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 116
+          "pointer" : 117
         },
         {
           "element_type" : {
-            "type_ptr" : 114
+            "type_ptr" : 115
           },
           "stride" : 24
         },
@@ -1333,7 +1339,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 117
+          "pointer" : 118
         },
         {
           "type_ptr" : 8
@@ -1353,7 +1359,7 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 118
+          "pointer" : 119
         },
         {
           "type_ptr" : 8
@@ -1370,11 +1376,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 119
+          "pointer" : 120
         },
         {
           "return_type" : {
-            "type_ptr" : 118
+            "type_ptr" : 119
           }
         },
         {
@@ -1391,7 +1397,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 118
+            "type_ptr" : 119
           }
         },
         {
@@ -1412,11 +1418,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 120
+          "pointer" : 121
         },
         {
           "return_type" : {
-            "type_ptr" : 118
+            "type_ptr" : 119
           }
         },
         {
@@ -1433,7 +1439,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 118
+            "type_ptr" : 119
           }
         },
         {
@@ -1458,12 +1464,12 @@
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 121
+          "pointer" : 122
         }
       ]],
       ["TemplateTypeParmType" , [
         {
-          "pointer" : 122
+          "pointer" : 123
         }
       ]],
       ["FunctionProtoType" , [
@@ -1488,19 +1494,19 @@
       ]],
       ["SubstTemplateTypeParmType" , [
         {
-          "pointer" : 123,
+          "pointer" : 124,
           "desugared_type" : 30
         }
       ]],
       ["SubstTemplateTypeParmType" , [
         {
-          "pointer" : 124,
+          "pointer" : 125,
           "desugared_type" : 8
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 125
+          "pointer" : 126
         },
         {
           "base_type" : 103
@@ -1508,32 +1514,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 126
+          "pointer" : 127
         },
         {
-          "type_ptr" : 125
+          "type_ptr" : 126
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 127,
-          "desugared_type" : 126
+          "pointer" : 128,
+          "desugared_type" : 127
         },
         {
           "child_type" : {
-            "type_ptr" : 126
+            "type_ptr" : 127
           },
-          "decl_ptr" : 128
+          "decl_ptr" : 129
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 45,
-          "desugared_type" : 126
+          "desugared_type" : 127
         },
         {
           "child_type" : {
-            "type_ptr" : 127
+            "type_ptr" : 128
           },
           "decl_ptr" : 44
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/unresolved_lookup.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/unresolved_lookup.cpp.exp
index 250d7ba89..d76879de7 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/unresolved_lookup.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/unresolved_lookup.cpp.exp
@@ -561,15 +561,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 75
         },
-        76
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 76
+        },
+        77
       ]],
       ["PointerType" , [
         {
-          "pointer" : 77
+          "pointer" : 78
         },
         {
           "type_ptr" : 15,
@@ -578,7 +584,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 78
+          "pointer" : 79
         },
         {
           "type_ptr" : 12,
@@ -587,7 +593,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 79
+          "pointer" : 80
         },
         {
           "type_ptr" : 12
@@ -595,33 +601,28 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 80
+          "pointer" : 81
         },
-        81
+        82
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 82
+          "pointer" : 83
         },
         {
           "element_type" : {
-            "type_ptr" : 80
+            "type_ptr" : 81
           },
           "stride" : 24
         },
         1
       ]],
-      ["TemplateTypeParmType" , [
-        {
-          "pointer" : 83
-        }
-      ]],
       ["TemplateTypeParmType" , [
         {
           "pointer" : 84
         }
       ]],
-      ["TemplateSpecializationType" , [
+      ["TemplateTypeParmType" , [
         {
           "pointer" : 85
         }
@@ -631,12 +632,12 @@
           "pointer" : 86
         }
       ]],
-      ["InjectedClassNameType" , [
+      ["TemplateSpecializationType" , [
         {
           "pointer" : 87
         }
       ]],
-      ["TemplateTypeParmType" , [
+      ["InjectedClassNameType" , [
         {
           "pointer" : 88
         }
@@ -646,12 +647,9 @@
           "pointer" : 89
         }
       ]],
-      ["PointerType" , [
+      ["TemplateTypeParmType" , [
         {
           "pointer" : 90
-        },
-        {
-          "type_ptr" : 88
         }
       ]],
       ["PointerType" , [
@@ -667,13 +665,21 @@
           "pointer" : 92
         },
         {
-          "type_ptr" : 87
+          "type_ptr" : 90
         }
       ]],
-      ["FunctionProtoType" , [
+      ["PointerType" , [
         {
           "pointer" : 93
         },
+        {
+          "type_ptr" : 88
+        }
+      ]],
+      ["FunctionProtoType" , [
+        {
+          "pointer" : 94
+        },
         {
           "return_type" : {
             "type_ptr" : 15
@@ -682,14 +688,14 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 90
+              "type_ptr" : 91
             }
           ]
         }
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 94
+          "pointer" : 95
         },
         {
           "return_type" : {
@@ -699,20 +705,20 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 91
+              "type_ptr" : 92
             }
           ]
         }
       ]],
       ["TemplateSpecializationType" , [
         {
-          "pointer" : 95,
-          "desugared_type" : 87
+          "pointer" : 96,
+          "desugared_type" : 88
         }
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 96
+          "pointer" : 97
         },
         {
           "base_type" : 69
@@ -720,32 +726,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 97
+          "pointer" : 98
         },
         {
-          "type_ptr" : 96
+          "type_ptr" : 97
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 98,
-          "desugared_type" : 97
+          "pointer" : 99,
+          "desugared_type" : 98
         },
         {
           "child_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 98
           },
-          "decl_ptr" : 99
+          "decl_ptr" : 100
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 9,
-          "desugared_type" : 97
+          "desugared_type" : 98
         },
         {
           "child_type" : {
-            "type_ptr" : 98
+            "type_ptr" : 99
           },
           "decl_ptr" : 8
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/using_directive.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/using_directive.cpp.exp
index 7d4335663..88df6d1ac 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/using_directive.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/using_directive.cpp.exp
@@ -820,15 +820,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 82
         },
-        83
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 83
+        },
+        84
       ]],
       ["PointerType" , [
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
           "type_ptr" : 10,
@@ -837,7 +843,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 85
+          "pointer" : 86
         },
         {
           "type_ptr" : 20,
@@ -846,7 +852,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 86
+          "pointer" : 87
         },
         {
           "type_ptr" : 20
@@ -854,17 +860,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 87
+          "pointer" : 88
         },
-        88
+        89
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
           "element_type" : {
-            "type_ptr" : 87
+            "type_ptr" : 88
           },
           "stride" : 24
         },
@@ -872,7 +878,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "base_type" : 76
@@ -880,32 +886,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 91
+          "pointer" : 92
         },
         {
-          "type_ptr" : 90
+          "type_ptr" : 91
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 92,
-          "desugared_type" : 91
+          "pointer" : 93,
+          "desugared_type" : 92
         },
         {
           "child_type" : {
-            "type_ptr" : 91
+            "type_ptr" : 92
           },
-          "decl_ptr" : 93
+          "decl_ptr" : 94
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 17,
-          "desugared_type" : 91
+          "desugared_type" : 92
         },
         {
           "child_type" : {
-            "type_ptr" : 92
+            "type_ptr" : 93
           },
           "decl_ptr" : 16
         }
diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/virtual_bases.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/virtual_bases.cpp.exp
index 6be9bc1c2..c00e54a51 100644
--- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/virtual_bases.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/virtual_bases.cpp.exp
@@ -203,7 +203,7 @@
             "type_ptr" : 11
           },
           {
-            "mangled_name" : "14779025497907219583",
+            "mangled_name" : "16649858826465904026",
             "is_cpp" : true,
             "decl_ptr_with_body" : 10,
             "body" : ["CompoundStmt" , [
@@ -253,7 +253,7 @@
             "type_ptr" : 14
           },
           {
-            "mangled_name" : "5328378654181921475",
+            "mangled_name" : "6691652126532499765",
             "is_cpp" : true,
             "decl_ptr_with_body" : 13,
             "body" : ["CompoundStmt" , [
@@ -302,7 +302,7 @@
             "type_ptr" : 17
           },
           {
-            "mangled_name" : "3430056695640597274",
+            "mangled_name" : "6367731417382615745",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -510,7 +510,7 @@
             "type_ptr" : 11
           },
           {
-            "mangled_name" : "10798876524598897542",
+            "mangled_name" : "8928078380412315851",
             "is_cpp" : true,
             "decl_ptr_with_body" : 26,
             "body" : ["CompoundStmt" , [
@@ -610,7 +610,7 @@
             "type_ptr" : 14
           },
           {
-            "mangled_name" : "7876366742276079110",
+            "mangled_name" : "6627935060446176348",
             "is_cpp" : true,
             "decl_ptr_with_body" : 29,
             "body" : ["CompoundStmt" , [
@@ -659,7 +659,7 @@
             "type_ptr" : 32
           },
           {
-            "mangled_name" : "7710293714478488613",
+            "mangled_name" : "6925252787601137710",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -872,7 +872,7 @@
             "type_ptr" : 11
           },
           {
-            "mangled_name" : "5740611327153041165",
+            "mangled_name" : "5244587546945854124",
             "is_cpp" : true,
             "decl_ptr_with_body" : 41,
             "body" : ["CompoundStmt" , [
@@ -922,7 +922,7 @@
             "type_ptr" : 14
           },
           {
-            "mangled_name" : "8663121109475859597",
+            "mangled_name" : "7422570726995459483",
             "is_cpp" : true,
             "decl_ptr_with_body" : 43,
             "body" : ["CompoundStmt" , [
@@ -971,7 +971,7 @@
             "type_ptr" : 46
           },
           {
-            "mangled_name" : "13331393607183256536",
+            "mangled_name" : "7407813062435547771",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -1176,7 +1176,7 @@
             "type_ptr" : 11
           },
           {
-            "mangled_name" : "7886195349376518403",
+            "mangled_name" : "9756747202958380830",
             "is_cpp" : true,
             "decl_ptr_with_body" : 55,
             "body" : ["CompoundStmt" , [
@@ -1370,7 +1370,7 @@
             "type_ptr" : 14
           },
           {
-            "mangled_name" : "2987579715549688623",
+            "mangled_name" : "4366070428831679553",
             "is_cpp" : true,
             "decl_ptr_with_body" : 60,
             "body" : ["CompoundStmt" , [
@@ -1419,7 +1419,7 @@
             "type_ptr" : 63
           },
           {
-            "mangled_name" : "13411848558695892246",
+            "mangled_name" : "1943152130981189005",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -1971,15 +1971,21 @@
         },
         "Half"
       ]],
-      ["RecordType" , [
+      ["BuiltinType" , [
         {
           "pointer" : 136
         },
-        137
+        "BFloat16"
+      ]],
+      ["RecordType" , [
+        {
+          "pointer" : 137
+        },
+        138
       ]],
       ["PointerType" , [
         {
-          "pointer" : 138
+          "pointer" : 139
         },
         {
           "type_ptr" : 76,
@@ -1988,7 +1994,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 139
+          "pointer" : 140
         },
         {
           "type_ptr" : 73,
@@ -1997,7 +2003,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 140
+          "pointer" : 141
         },
         {
           "type_ptr" : 73
@@ -2005,17 +2011,17 @@
       ]],
       ["RecordType" , [
         {
-          "pointer" : 141
+          "pointer" : 142
         },
-        142
+        143
       ]],
       ["ConstantArrayType" , [
         {
-          "pointer" : 143
+          "pointer" : 144
         },
         {
           "element_type" : {
-            "type_ptr" : 141
+            "type_ptr" : 142
           },
           "stride" : 24
         },
@@ -2029,7 +2035,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 144
+          "pointer" : 145
         },
         {
           "type_ptr" : 8
@@ -2049,7 +2055,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 145
+          "pointer" : 146
         },
         {
           "return_type" : {
@@ -2079,7 +2085,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 146
+          "pointer" : 147
         },
         {
           "type_ptr" : 24
@@ -2087,7 +2093,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 147
+          "pointer" : 148
         },
         {
           "return_type" : {
@@ -2108,7 +2114,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 148
+          "pointer" : 149
         },
         {
           "return_type" : {
@@ -2151,7 +2157,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 149
+          "pointer" : 150
         },
         {
           "return_type" : {
@@ -2185,7 +2191,7 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 150
+          "pointer" : 151
         },
         {
           "type_ptr" : 24
@@ -2193,11 +2199,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 151
+          "pointer" : 152
         },
         {
           "return_type" : {
-            "type_ptr" : 150
+            "type_ptr" : 151
           }
         },
         {
@@ -2214,7 +2220,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 150
+            "type_ptr" : 151
           }
         },
         {
@@ -2227,7 +2233,7 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 152
+          "pointer" : 153
         },
         {
           "type_ptr" : 8
@@ -2235,11 +2241,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 153
+          "pointer" : 154
         },
         {
           "return_type" : {
-            "type_ptr" : 152
+            "type_ptr" : 153
           }
         },
         {
@@ -2256,7 +2262,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 152
+            "type_ptr" : 153
           }
         },
         {
@@ -2275,7 +2281,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 154
+          "pointer" : 155
         },
         {
           "type_ptr" : 39
@@ -2283,7 +2289,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 155
+          "pointer" : 156
         },
         {
           "return_type" : {
@@ -2301,7 +2307,7 @@
       ]],
       ["PointerType" , [
         {
-          "pointer" : 156
+          "pointer" : 157
         },
         {
           "type_ptr" : 53
@@ -2309,7 +2315,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 157
+          "pointer" : 158
         },
         {
           "return_type" : {
@@ -2330,7 +2336,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 158
+          "pointer" : 159
         },
         {
           "return_type" : {
@@ -2373,7 +2379,7 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 159
+          "pointer" : 160
         },
         {
           "return_type" : {
@@ -2407,7 +2413,7 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 160
+          "pointer" : 161
         },
         {
           "type_ptr" : 53
@@ -2415,11 +2421,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 161
+          "pointer" : 162
         },
         {
           "return_type" : {
-            "type_ptr" : 160
+            "type_ptr" : 161
           }
         },
         {
@@ -2436,7 +2442,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 160
+            "type_ptr" : 161
           }
         },
         {
@@ -2449,7 +2455,7 @@
       ]],
       ["LValueReferenceType" , [
         {
-          "pointer" : 162
+          "pointer" : 163
         },
         {
           "type_ptr" : 39
@@ -2457,11 +2463,11 @@
       ]],
       ["FunctionProtoType" , [
         {
-          "pointer" : 163
+          "pointer" : 164
         },
         {
           "return_type" : {
-            "type_ptr" : 162
+            "type_ptr" : 163
           }
         },
         {
@@ -2478,7 +2484,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 162
+            "type_ptr" : 163
           }
         },
         {
@@ -2491,7 +2497,7 @@
       ]],
       ["ObjCObjectType" , [
         {
-          "pointer" : 164
+          "pointer" : 165
         },
         {
           "base_type" : 130
@@ -2499,32 +2505,32 @@
       ]],
       ["ObjCObjectPointerType" , [
         {
-          "pointer" : 165
+          "pointer" : 166
         },
         {
-          "type_ptr" : 164
+          "type_ptr" : 165
         }
       ]],
       ["TypedefType" , [
         {
-          "pointer" : 166,
-          "desugared_type" : 165
+          "pointer" : 167,
+          "desugared_type" : 166
         },
         {
           "child_type" : {
-            "type_ptr" : 165
+            "type_ptr" : 166
           },
-          "decl_ptr" : 167
+          "decl_ptr" : 168
         }
       ]],
       ["TypedefType" , [
         {
           "pointer" : 70,
-          "desugared_type" : 165
+          "desugared_type" : 166
         },
         {
           "child_type" : {
-            "type_ptr" : 166
+            "type_ptr" : 167
           },
           "decl_ptr" : 69
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/Hello.m.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/Hello.m.exp
index 359dcc086..303057433 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/Hello.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/Hello.m.exp
@@ -1826,9 +1826,20 @@
         "is_implicit" : true,
         "is_used" : true,
         "attributes" : [
-          <"FormatAttr" : (
+          <"BuiltinAttr" : (
             {
               "pointer" : 89,
+              "source_range" : (
+                {
+                },
+                {
+                }
+              )
+            }
+          )>,
+          <"FormatAttr" : (
+            {
+              "pointer" : 90,
               "source_range" : (
                 {
                   "column" : 13
@@ -1848,14 +1859,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 91,
+              "pointer" : 92,
               "source_range" : (
                 {
                 },
@@ -1881,7 +1892,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 92,
+        "pointer" : 93,
         "source_range" : (
           {
             "column" : 1
@@ -1893,9 +1904,20 @@
         "is_used" : true,
         "is_this_declaration_referenced" : true,
         "attributes" : [
+          <"BuiltinAttr" : (
+            {
+              "pointer" : 94,
+              "source_range" : (
+                {
+                },
+                {
+                }
+              )
+            }
+          )>,
           <"FormatAttr" : (
             {
-              "pointer" : 93,
+              "pointer" : 95,
               "source_range" : (
                 {
                   "column" : 13
@@ -1915,14 +1937,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 94,
+              "pointer" : 96,
               "source_range" : (
                 {
                   "column" : 19
@@ -1950,7 +1972,7 @@
     )>,
     <"ObjCInterfaceDecl" : (
       {
-        "pointer" : 95,
+        "pointer" : 97,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -1973,8 +1995,8 @@
       [
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 96,
-            "parent_pointer" : 95,
+            "pointer" : 98,
+            "parent_pointer" : 97,
             "source_range" : (
               {
                 "line" : 11,
@@ -1995,12 +2017,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 97
+              "type_ptr" : 99
             },
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 98,
+                  "pointer" : 100,
                   "source_range" : (
                     {
                       "column" : 14
@@ -2027,7 +2049,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 99,
+                  "pointer" : 101,
                   "source_range" : (
                     {
                     },
@@ -2043,7 +2065,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 100,
+                  "type_ptr" : 102,
                   "is_const" : true
                 },
                 {
@@ -2051,7 +2073,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 101,
+                  "pointer" : 103,
                   "source_range" : (
                     {
                     },
@@ -2092,7 +2114,7 @@
         },
         "implementation" : {
           "kind" : <"ObjCImplementation">,
-          "decl_pointer" : 102,
+          "decl_pointer" : 104,
           "name" : {
             "name" : "Hello",
             "qual_name" : [
@@ -2104,7 +2126,7 @@
     )>,
     <"ObjCImplementationDecl" : (
       {
-        "pointer" : 102,
+        "pointer" : 104,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -2126,8 +2148,8 @@
       [
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 103,
-            "parent_pointer" : 102,
+            "pointer" : 105,
+            "parent_pointer" : 104,
             "source_range" : (
               {
                 "line" : 15,
@@ -2149,12 +2171,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 97
+              "type_ptr" : 99
             },
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 104,
+                  "pointer" : 106,
                   "source_range" : (
                     {
                       "line" : 15,
@@ -2184,7 +2206,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 105,
+                  "pointer" : 107,
                   "source_range" : (
                     {
                     },
@@ -2200,7 +2222,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 100,
+                  "type_ptr" : 102,
                   "is_const" : true
                 },
                 {
@@ -2208,7 +2230,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 106,
+                  "pointer" : 108,
                   "source_range" : (
                     {
                     },
@@ -2232,7 +2254,7 @@
             ],
             "body" : <"CompoundStmt" : (
               {
-                "pointer" : 107,
+                "pointer" : 109,
                 "source_range" : (
                   {
                     "column" : 20
@@ -2246,7 +2268,7 @@
               [
                 <"IfStmt" : (
                   {
-                    "pointer" : 108,
+                    "pointer" : 110,
                     "source_range" : (
                       {
                         "line" : 16,
@@ -2261,7 +2283,7 @@
                   [
                     <"BinaryOperator" : (
                       {
-                        "pointer" : 109,
+                        "pointer" : 111,
                         "source_range" : (
                           {
                             "line" : 16,
@@ -2275,7 +2297,7 @@
                       [
                         <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 110,
+                            "pointer" : 112,
                             "source_range" : (
                               {
                                 "column" : 7
@@ -2288,7 +2310,7 @@
                           [
                             <"DeclRefExpr" : (
                               {
-                                "pointer" : 111,
+                                "pointer" : 113,
                                 "source_range" : (
                                   {
                                     "column" : 7
@@ -2309,7 +2331,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : <"ParmVar">,
-                                  "decl_pointer" : 104,
+                                  "decl_pointer" : 106,
                                   "name" : {
                                     "name" : "i",
                                     "qual_name" : [
@@ -2336,7 +2358,7 @@
                         )>,
                         <"IntegerLiteral" : (
                           {
-                            "pointer" : 112,
+                            "pointer" : 114,
                             "source_range" : (
                               {
                                 "column" : 11
@@ -2371,7 +2393,7 @@
                     )>,
                     <"CompoundStmt" : (
                       {
-                        "pointer" : 113,
+                        "pointer" : 115,
                         "source_range" : (
                           {
                             "column" : 14
@@ -2385,7 +2407,7 @@
                       [
                         <"CallExpr" : (
                           {
-                            "pointer" : 114,
+                            "pointer" : 116,
                             "source_range" : (
                               {
                                 "line" : 17,
@@ -2399,7 +2421,7 @@
                           [
                             <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 115,
+                                "pointer" : 117,
                                 "source_range" : (
                                   {
                                     "column" : 5
@@ -2412,7 +2434,7 @@
                               [
                                 <"DeclRefExpr" : (
                                   {
-                                    "pointer" : 116,
+                                    "pointer" : 118,
                                     "source_range" : (
                                       {
                                         "column" : 5
@@ -2426,13 +2448,13 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 90
+                                      "type_ptr" : 91
                                     }
                                   },
                                   {
                                     "decl_ref" : {
                                       "kind" : <"Function">,
-                                      "decl_pointer" : 92,
+                                      "decl_pointer" : 93,
                                       "name" : {
                                         "name" : "NSLog",
                                         "qual_name" : [
@@ -2440,7 +2462,7 @@
                                         ]
                                       },
                                       "qual_type" : {
-                                        "type_ptr" : 90
+                                        "type_ptr" : 91
                                       }
                                     }
                                   }
@@ -2448,7 +2470,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 117
+                                  "type_ptr" : 119
                                 }
                               },
                               {
@@ -2459,7 +2481,7 @@
                             )>,
                             <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 118,
+                                "pointer" : 120,
                                 "source_range" : (
                                   {
                                     "column" : 11
@@ -2472,7 +2494,7 @@
                               [
                                 <"ObjCStringLiteral" : (
                                   {
-                                    "pointer" : 119,
+                                    "pointer" : 121,
                                     "source_range" : (
                                       {
                                         "column" : 11
@@ -2485,7 +2507,7 @@
                                   [
                                     <"StringLiteral" : (
                                       {
-                                        "pointer" : 120,
+                                        "pointer" : 122,
                                         "source_range" : (
                                           {
                                             "column" : 12
@@ -2499,7 +2521,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 121
+                                          "type_ptr" : 123
                                         },
                                         "value_kind" : <"LValue">
                                       },
@@ -2528,7 +2550,7 @@
                             )>,
                             <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 122,
+                                "pointer" : 124,
                                 "source_range" : (
                                   {
                                     "column" : 34
@@ -2541,7 +2563,7 @@
                               [
                                 <"DeclRefExpr" : (
                                   {
-                                    "pointer" : 123,
+                                    "pointer" : 125,
                                     "source_range" : (
                                       {
                                         "column" : 34
@@ -2562,7 +2584,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : <"ParmVar">,
-                                      "decl_pointer" : 104,
+                                      "decl_pointer" : 106,
                                       "name" : {
                                         "name" : "i",
                                         "qual_name" : [
@@ -2590,7 +2612,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 97
+                              "type_ptr" : 99
                             }
                           }
                         )>
@@ -2598,8 +2620,8 @@
                     )>
                   ],
                   {
-                    "cond" : 109,
-                    "then" : 113
+                    "cond" : 111,
+                    "then" : 115
                   }
                 )>
               ]
@@ -2613,7 +2635,7 @@
       {
         "class_interface" : {
           "kind" : <"ObjCInterface">,
-          "decl_pointer" : 95,
+          "decl_pointer" : 97,
           "name" : {
             "name" : "Hello",
             "qual_name" : [
@@ -2625,7 +2647,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 124,
+        "pointer" : 126,
         "source_range" : (
           {
             "line" : 22,
@@ -2644,13 +2666,13 @@
         ]
       },
       {
-        "type_ptr" : 125
+        "type_ptr" : 127
       },
       {
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 126,
+              "pointer" : 128,
               "source_range" : (
                 {
                   "line" : 22,
@@ -2676,7 +2698,7 @@
           )>,
           <"ParmVarDecl" : (
             {
-              "pointer" : 127,
+              "pointer" : 129,
               "source_range" : (
                 {
                   "column" : 20
@@ -2693,17 +2715,17 @@
               ]
             },
             {
-              "type_ptr" : 128
+              "type_ptr" : 130
             },
             {
               "parm_index_in_function" : 1
             }
           )>
         ],
-        "decl_ptr_with_body" : 124,
+        "decl_ptr_with_body" : 126,
         "body" : <"CompoundStmt" : (
           {
-            "pointer" : 129,
+            "pointer" : 131,
             "source_range" : (
               {
                 "column" : 34
@@ -2717,7 +2739,7 @@
           [
             <"ForStmt" : (
               {
-                "pointer" : 130,
+                "pointer" : 132,
                 "source_range" : (
                   {
                     "line" : 23,
@@ -2732,7 +2754,7 @@
               [
                 <"DeclStmt" : (
                   {
-                    "pointer" : 131,
+                    "pointer" : 133,
                     "source_range" : (
                       {
                         "line" : 23,
@@ -2746,7 +2768,7 @@
                   [
                     <"IntegerLiteral" : (
                       {
-                        "pointer" : 132,
+                        "pointer" : 134,
                         "source_range" : (
                           {
                             "column" : 16
@@ -2773,7 +2795,7 @@
                   [
                     <"VarDecl" : (
                       {
-                        "pointer" : 133,
+                        "pointer" : 135,
                         "source_range" : (
                           {
                             "column" : 8
@@ -2797,7 +2819,7 @@
                       {
                         "init_expr" : <"IntegerLiteral" : (
                           {
-                            "pointer" : 132,
+                            "pointer" : 134,
                             "source_range" : (
                               {
                                 "column" : 16
@@ -2826,7 +2848,7 @@
                 )>,
                 <"NullStmt" : (
                   {
-                    "pointer" : 134,
+                    "pointer" : 136,
                     "source_range" : (
                       {
                       },
@@ -2839,7 +2861,7 @@
                 )>,
                 <"BinaryOperator" : (
                   {
-                    "pointer" : 135,
+                    "pointer" : 137,
                     "source_range" : (
                       {
                         "column" : 19
@@ -2852,7 +2874,7 @@
                   [
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 136,
+                        "pointer" : 138,
                         "source_range" : (
                           {
                             "column" : 19
@@ -2865,7 +2887,7 @@
                       [
                         <"DeclRefExpr" : (
                           {
-                            "pointer" : 137,
+                            "pointer" : 139,
                             "source_range" : (
                               {
                                 "column" : 19
@@ -2886,7 +2908,7 @@
                           {
                             "decl_ref" : {
                               "kind" : <"Var">,
-                              "decl_pointer" : 133,
+                              "decl_pointer" : 135,
                               "name" : {
                                 "name" : "i",
                                 "qual_name" : [
@@ -2913,7 +2935,7 @@
                     )>,
                     <"IntegerLiteral" : (
                       {
-                        "pointer" : 138,
+                        "pointer" : 140,
                         "source_range" : (
                           {
                             "column" : 23
@@ -2948,7 +2970,7 @@
                 )>,
                 <"UnaryOperator" : (
                   {
-                    "pointer" : 139,
+                    "pointer" : 141,
                     "source_range" : (
                       {
                         "column" : 26
@@ -2961,7 +2983,7 @@
                   [
                     <"DeclRefExpr" : (
                       {
-                        "pointer" : 140,
+                        "pointer" : 142,
                         "source_range" : (
                           {
                             "column" : 26
@@ -2982,7 +3004,7 @@
                       {
                         "decl_ref" : {
                           "kind" : <"Var">,
-                          "decl_pointer" : 133,
+                          "decl_pointer" : 135,
                           "name" : {
                             "name" : "i",
                             "qual_name" : [
@@ -3008,7 +3030,7 @@
                 )>,
                 <"CompoundStmt" : (
                   {
-                    "pointer" : 141,
+                    "pointer" : 143,
                     "source_range" : (
                       {
                         "column" : 31
@@ -3022,7 +3044,7 @@
                   [
                     <"ObjCAutoreleasePoolStmt" : (
                       {
-                        "pointer" : 142,
+                        "pointer" : 144,
                         "source_range" : (
                           {
                             "line" : 24,
@@ -3037,7 +3059,7 @@
                       [
                         <"CompoundStmt" : (
                           {
-                            "pointer" : 143,
+                            "pointer" : 145,
                             "source_range" : (
                               {
                                 "line" : 24,
@@ -3052,7 +3074,7 @@
                           [
                             <"ExprWithCleanups" : (
                               {
-                                "pointer" : 144,
+                                "pointer" : 146,
                                 "source_range" : (
                                   {
                                     "line" : 25,
@@ -3066,7 +3088,7 @@
                               [
                                 <"ObjCMessageExpr" : (
                                   {
-                                    "pointer" : 145,
+                                    "pointer" : 147,
                                     "source_range" : (
                                       {
                                         "column" : 7
@@ -3079,7 +3101,7 @@
                                   [
                                     <"ImplicitCastExpr" : (
                                       {
-                                        "pointer" : 146,
+                                        "pointer" : 148,
                                         "source_range" : (
                                           {
                                             "column" : 8
@@ -3092,7 +3114,7 @@
                                       [
                                         <"ObjCMessageExpr" : (
                                           {
-                                            "pointer" : 147,
+                                            "pointer" : 149,
                                             "source_range" : (
                                               {
                                                 "column" : 8
@@ -3106,21 +3128,21 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 100
+                                              "type_ptr" : 102
                                             }
                                           },
                                           {
                                             "selector" : "new",
                                             "decl_pointer" : 24,
                                             "receiver_kind" : <"Class" : {
-                                              "type_ptr" : 148
+                                              "type_ptr" : 150
                                             }>
                                           }
                                         )>
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 100
+                                          "type_ptr" : 102
                                         }
                                       },
                                       {
@@ -3131,7 +3153,7 @@
                                     )>,
                                     <"ImplicitCastExpr" : (
                                       {
-                                        "pointer" : 149,
+                                        "pointer" : 151,
                                         "source_range" : (
                                           {
                                             "column" : 24
@@ -3144,7 +3166,7 @@
                                       [
                                         <"DeclRefExpr" : (
                                           {
-                                            "pointer" : 150,
+                                            "pointer" : 152,
                                             "source_range" : (
                                               {
                                                 "column" : 24
@@ -3165,7 +3187,7 @@
                                           {
                                             "decl_ref" : {
                                               "kind" : <"Var">,
-                                              "decl_pointer" : 133,
+                                              "decl_pointer" : 135,
                                               "name" : {
                                                 "name" : "i",
                                                 "qual_name" : [
@@ -3193,19 +3215,19 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 97
+                                      "type_ptr" : 99
                                     }
                                   },
                                   {
                                     "selector" : "say:",
                                     "is_definition_found" : true,
-                                    "decl_pointer" : 103
+                                    "decl_pointer" : 105
                                   }
                                 )>
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 97
+                                  "type_ptr" : 99
                                 }
                               },
                               {
@@ -3221,7 +3243,7 @@
             )>,
             <"ReturnStmt" : (
               {
-                "pointer" : 151,
+                "pointer" : 153,
                 "source_range" : (
                   {
                     "line" : 28,
@@ -3235,7 +3257,7 @@
               [
                 <"IntegerLiteral" : (
                   {
-                    "pointer" : 152,
+                    "pointer" : 154,
                     "source_range" : (
                       {
                         "column" : 10
@@ -3266,7 +3288,7 @@
     )>,
     <"TypedefDecl" : (
       {
-        "pointer" : 153,
+        "pointer" : 155,
         "source_range" : (
           {
           },
@@ -3302,31 +3324,31 @@
     "types" : [
       <"BuiltinType" : (
         {
-          "pointer" : 97
+          "pointer" : 99
         },
         <"Void">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 154
+          "pointer" : 156
         },
         <"Bool">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 155
+          "pointer" : 157
         },
         <"Char_S">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 156
+          "pointer" : 158
         },
         <"SChar">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 157
+          "pointer" : 159
         },
         <"Short">
       )>,
@@ -3338,25 +3360,25 @@
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 158
+          "pointer" : 160
         },
         <"Long">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 159
+          "pointer" : 161
         },
         <"LongLong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 160
+          "pointer" : 162
         },
         <"UChar">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 161
+          "pointer" : 163
         },
         <"UShort">
       )>,
@@ -3368,369 +3390,375 @@
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 162
+          "pointer" : 164
         },
         <"ULong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 163
+          "pointer" : 165
         },
         <"ULongLong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 164
+          "pointer" : 166
         },
         <"Float">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 165
+          "pointer" : 167
         },
         <"Double">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 166
+          "pointer" : 168
         },
         <"LongDouble">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 167
+          "pointer" : 169
         },
         <"Float128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 168
+          "pointer" : 170
         },
         <"Float16">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 169
+          "pointer" : 171
         },
         <"ShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 170
+          "pointer" : 172
         },
         <"Accum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 171
+          "pointer" : 173
         },
         <"LongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 172
+          "pointer" : 174
         },
         <"UShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 173
+          "pointer" : 175
         },
         <"UAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 174
+          "pointer" : 176
         },
         <"ULongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 175
+          "pointer" : 177
         },
         <"ShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 176
+          "pointer" : 178
         },
         <"Fract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 177
+          "pointer" : 179
         },
         <"LongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 178
+          "pointer" : 180
         },
         <"UShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 179
+          "pointer" : 181
         },
         <"UFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 180
+          "pointer" : 182
         },
         <"ULongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 181
+          "pointer" : 183
         },
         <"SatShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 182
+          "pointer" : 184
         },
         <"SatAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 183
+          "pointer" : 185
         },
         <"SatLongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 184
+          "pointer" : 186
         },
         <"SatUShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 185
+          "pointer" : 187
         },
         <"SatUAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 186
+          "pointer" : 188
         },
         <"SatULongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 187
+          "pointer" : 189
         },
         <"SatShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 188
+          "pointer" : 190
         },
         <"SatFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 189
+          "pointer" : 191
         },
         <"SatLongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 190
+          "pointer" : 192
         },
         <"SatUShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 191
+          "pointer" : 193
         },
         <"SatUFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 192
+          "pointer" : 194
         },
         <"SatULongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 193
+          "pointer" : 195
         },
         <"Int128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 194
+          "pointer" : 196
         },
         <"UInt128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 195
+          "pointer" : 197
         },
         <"WChar_S">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 196
+          "pointer" : 198
         },
         <"Char8">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 197
+          "pointer" : 199
         },
         <"Dependent">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 198
+          "pointer" : 200
         },
         <"Overload">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 199
+          "pointer" : 201
         },
         <"BoundMember">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 200
+          "pointer" : 202
         },
         <"PseudoObject">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 201
+          "pointer" : 203
         },
         <"UnknownAny">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 202
+          "pointer" : 204
         },
         <"ARCUnbridgedCast">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 203
+          "pointer" : 205
         },
         <"BuiltinFn">
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 204
+          "pointer" : 206
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 205
+          "pointer" : 207
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 206
+          "pointer" : 208
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 207
+          "pointer" : 209
         }
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 208
+          "pointer" : 210
         },
         <"ObjCId">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 209
+          "pointer" : 211
         },
         <"ObjCClass">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 210
+          "pointer" : 212
         },
         <"ObjCSel">
       )>,
       <"PointerType" : (
         {
-          "pointer" : 211
+          "pointer" : 213
         },
         {
-          "type_ptr" : 97
+          "type_ptr" : 99
         }
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 212
+          "pointer" : 214
         },
         <"NullPtr">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 213
+          "pointer" : 215
         },
         <"Half">
       )>,
+      <"BuiltinType" : (
+        {
+          "pointer" : 216
+        },
+        <"BFloat16">
+      )>,
       <"PointerType" : (
         {
-          "pointer" : 214
+          "pointer" : 217
         },
         {
-          "type_ptr" : 210
+          "type_ptr" : 212
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 215
+          "pointer" : 218
         },
         {
-          "base_type" : 208
+          "base_type" : 210
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 216
+          "pointer" : 219
         },
         {
-          "type_ptr" : 215
+          "type_ptr" : 218
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 217
+          "pointer" : 220
         },
         {
-          "base_type" : 209
+          "base_type" : 211
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 218
+          "pointer" : 221
         },
         {
-          "type_ptr" : 217
+          "type_ptr" : 220
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 219
+          "pointer" : 222
         },
         10
       )>,
       <"RecordType" : (
         {
-          "pointer" : 220
+          "pointer" : 223
         },
-        221
+        224
       )>,
       <"PointerType" : (
         {
-          "pointer" : 222
+          "pointer" : 225
         },
         {
           "type_ptr" : 53,
@@ -3739,34 +3767,34 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 223
+          "pointer" : 226
         },
         {
-          "type_ptr" : 155,
+          "type_ptr" : 157,
           "is_const" : true
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 224
+          "pointer" : 227
         },
         {
-          "type_ptr" : 155
+          "type_ptr" : 157
         }
       )>,
       <"RecordType" : (
         {
-          "pointer" : 225
+          "pointer" : 228
         },
-        226
+        229
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 227
+          "pointer" : 230
         },
         {
           "element_type" : {
-            "type_ptr" : 225
+            "type_ptr" : 228
           },
           "stride" : 24
         },
@@ -3774,18 +3802,18 @@
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 228
+          "pointer" : 231
         },
         18
       )>,
       <"TypedefType" : (
         {
           "pointer" : 7,
-          "desugared_type" : 216
+          "desugared_type" : 219
         },
         {
           "child_type" : {
-            "type_ptr" : 216
+            "type_ptr" : 219
           },
           "decl_ptr" : 6
         }
@@ -3793,23 +3821,23 @@
       <"TypedefType" : (
         {
           "pointer" : 21,
-          "desugared_type" : 216
+          "desugared_type" : 219
         },
         {
           "child_type" : {
             "type_ptr" : 7
           },
-          "decl_ptr" : 153
+          "decl_ptr" : 155
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 9,
-          "desugared_type" : 218
+          "desugared_type" : 221
         },
         {
           "child_type" : {
-            "type_ptr" : 218
+            "type_ptr" : 221
           },
           "decl_ptr" : 8
         }
@@ -3817,11 +3845,11 @@
       <"TypedefType" : (
         {
           "pointer" : 5,
-          "desugared_type" : 214
+          "desugared_type" : 217
         },
         {
           "child_type" : {
-            "type_ptr" : 214
+            "type_ptr" : 217
           },
           "decl_ptr" : 4
         }
@@ -3831,7 +3859,7 @@
           "pointer" : 30
         },
         {
-          "type_ptr" : 228
+          "type_ptr" : 231
         }
       )>,
       <"TypedefType" : (
@@ -3851,18 +3879,18 @@
           "pointer" : 47
         },
         {
-          "type_ptr" : 219
+          "type_ptr" : 222
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 229
+          "pointer" : 232
         },
         50
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 230
+          "pointer" : 233
         },
         56
       )>,
@@ -3883,29 +3911,29 @@
           "pointer" : 59
         },
         {
-          "type_ptr" : 230
+          "type_ptr" : 233
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 231
+          "pointer" : 234
         },
         61
       )>,
       <"IncompleteArrayType" : (
         {
-          "pointer" : 232
+          "pointer" : 235
         },
         {
           "element_type" : {
-            "type_ptr" : 216
+            "type_ptr" : 219
           },
           "stride" : 8
         }
       )>,
       <"IncompleteArrayType" : (
         {
-          "pointer" : 233
+          "pointer" : 236
         },
         {
           "element_type" : {
@@ -3917,7 +3945,7 @@
       )>,
       <"IncompleteArrayType" : (
         {
-          "pointer" : 234
+          "pointer" : 237
         },
         {
           "element_type" : {
@@ -3929,16 +3957,16 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 235
+          "pointer" : 238
         },
         {
-          "type_ptr" : 216,
+          "type_ptr" : 219,
           "is_const" : true
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 236
+          "pointer" : 239
         },
         {
           "type_ptr" : 7,
@@ -3948,10 +3976,10 @@
       <"DecayedType" : (
         {
           "pointer" : 64,
-          "desugared_type" : 236
+          "desugared_type" : 239
         },
         {
-          "type_ptr" : 236
+          "type_ptr" : 239
         }
       )>,
       <"ObjCObjectPointerType" : (
@@ -3959,21 +3987,21 @@
           "pointer" : 72
         },
         {
-          "type_ptr" : 231
+          "type_ptr" : 234
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 237
+          "pointer" : 240
         },
         74
       )>,
       <"PointerType" : (
         {
-          "pointer" : 238
+          "pointer" : 241
         },
         {
-          "type_ptr" : 216
+          "type_ptr" : 219
         }
       )>,
       <"PointerType" : (
@@ -3989,22 +4017,22 @@
           "pointer" : 85
         },
         {
-          "type_ptr" : 237
+          "type_ptr" : 240
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 239
+          "pointer" : 242
         },
         87
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 240
+          "pointer" : 243
         },
         {
           "return_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 99
           }
         },
         {
@@ -4017,11 +4045,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 241
+          "pointer" : 244
         },
         {
           "return_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 99
           }
         },
         {
@@ -4034,28 +4062,28 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 242
+          "pointer" : 245
         },
         {
           "return_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 99
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 216
+              "type_ptr" : 219
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "return_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 99
           }
         },
         {
@@ -4068,25 +4096,25 @@
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 148
+          "pointer" : 150
         },
-        95
+        97
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 100
+          "pointer" : 102
         },
         {
-          "type_ptr" : 148
+          "type_ptr" : 150
         }
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 121
+          "pointer" : 123
         },
         {
           "element_type" : {
-            "type_ptr" : 155
+            "type_ptr" : 157
           },
           "stride" : 1
         },
@@ -4094,51 +4122,51 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 243
+          "pointer" : 246
         },
         {
-          "type_ptr" : 242
+          "type_ptr" : 245
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 117
+          "pointer" : 119
         },
         {
-          "type_ptr" : 90
+          "type_ptr" : 91
         }
       )>,
       <"IncompleteArrayType" : (
         {
-          "pointer" : 244
+          "pointer" : 247
         },
         {
           "element_type" : {
-            "type_ptr" : 224
+            "type_ptr" : 227
           },
           "stride" : 8
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 245
+          "pointer" : 248
         },
         {
-          "type_ptr" : 224
+          "type_ptr" : 227
         }
       )>,
       <"DecayedType" : (
         {
-          "pointer" : 128,
-          "desugared_type" : 245
+          "pointer" : 130,
+          "desugared_type" : 248
         },
         {
-          "type_ptr" : 245
+          "type_ptr" : 248
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 246
+          "pointer" : 249
         },
         {
           "return_type" : {
@@ -4151,14 +4179,14 @@
               "type_ptr" : 53
             },
             {
-              "type_ptr" : 245
+              "type_ptr" : 248
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 125
+          "pointer" : 127
         },
         {
           "return_type" : {
@@ -4171,7 +4199,7 @@
               "type_ptr" : 53
             },
             {
-              "type_ptr" : 128
+              "type_ptr" : 130
             }
           ]
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCBridgeTransferTest.m.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCBridgeTransferTest.m.exp
index 2e4441d5e..224aaf787 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCBridgeTransferTest.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCBridgeTransferTest.m.exp
@@ -1825,9 +1825,20 @@
         ),
         "is_implicit" : true,
         "attributes" : [
-          <"FormatAttr" : (
+          <"BuiltinAttr" : (
             {
               "pointer" : 89,
+              "source_range" : (
+                {
+                },
+                {
+                }
+              )
+            }
+          )>,
+          <"FormatAttr" : (
+            {
+              "pointer" : 90,
               "source_range" : (
                 {
                   "column" : 13
@@ -1847,14 +1858,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 91,
+              "pointer" : 92,
               "source_range" : (
                 {
                 },
@@ -1880,7 +1891,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 92,
+        "pointer" : 93,
         "source_range" : (
           {
             "column" : 1
@@ -1890,9 +1901,20 @@
           }
         ),
         "attributes" : [
+          <"BuiltinAttr" : (
+            {
+              "pointer" : 94,
+              "source_range" : (
+                {
+                },
+                {
+                }
+              )
+            }
+          )>,
           <"FormatAttr" : (
             {
-              "pointer" : 93,
+              "pointer" : 95,
               "source_range" : (
                 {
                   "column" : 13
@@ -1912,14 +1934,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 94,
+              "pointer" : 96,
               "source_range" : (
                 {
                   "column" : 19
@@ -1947,7 +1969,7 @@
     )>,
     <"RecordDecl" : (
       {
-        "pointer" : 95,
+        "pointer" : 97,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -1967,20 +1989,20 @@
           "ABFDataRef"
         ]
       },
-      96,
+      98,
       [
       ],
       {
       },
       <"TTK_Struct">,
       {
-        "definition_ptr" : 95,
+        "definition_ptr" : 97,
         "is_complete_definition" : true
       }
     )>,
     <"TypedefDecl" : (
       {
-        "pointer" : 97,
+        "pointer" : 99,
         "source_range" : (
           {
             "line" : 10,
@@ -1999,13 +2021,13 @@
           "ABFDataRef"
         ]
       },
-      98,
+      100,
       {
       }
     )>,
     <"ObjCInterfaceDecl" : (
       {
-        "pointer" : 99,
+        "pointer" : 101,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -2033,7 +2055,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 100,
+        "pointer" : 102,
         "source_range" : (
           {
             "line" : 16,
@@ -2053,14 +2075,14 @@
         ]
       },
       {
-        "type_ptr" : 101
+        "type_ptr" : 103
       },
       {
       }
     )>,
     <"ObjCInterfaceDecl" : (
       {
-        "pointer" : 102,
+        "pointer" : 104,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -2096,7 +2118,7 @@
         },
         "implementation" : {
           "kind" : <"ObjCImplementation">,
-          "decl_pointer" : 103,
+          "decl_pointer" : 105,
           "name" : {
             "name" : "A",
             "qual_name" : [
@@ -2108,7 +2130,7 @@
     )>,
     <"ObjCImplementationDecl" : (
       {
-        "pointer" : 103,
+        "pointer" : 105,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -2130,8 +2152,8 @@
       [
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 104,
-            "parent_pointer" : 103,
+            "pointer" : 106,
+            "parent_pointer" : 105,
             "source_range" : (
               {
                 "line" : 23,
@@ -2153,12 +2175,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 105
+              "type_ptr" : 107
             },
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 106,
+                  "pointer" : 108,
                   "source_range" : (
                     {
                     },
@@ -2174,7 +2196,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 107,
+                  "type_ptr" : 109,
                   "is_const" : true
                 },
                 {
@@ -2182,7 +2204,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 108,
+                  "pointer" : 110,
                   "source_range" : (
                     {
                     },
@@ -2206,7 +2228,7 @@
             ],
             "body" : <"CompoundStmt" : (
               {
-                "pointer" : 109,
+                "pointer" : 111,
                 "source_range" : (
                   {
                     "line" : 23,
@@ -2221,7 +2243,7 @@
               [
                 <"DeclStmt" : (
                   {
-                    "pointer" : 110,
+                    "pointer" : 112,
                     "source_range" : (
                       {
                         "line" : 24,
@@ -2235,7 +2257,7 @@
                   [
                     <"ExprWithCleanups" : (
                       {
-                        "pointer" : 111,
+                        "pointer" : 113,
                         "source_range" : (
                           {
                             "column" : 23
@@ -2248,7 +2270,7 @@
                       [
                         <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 112,
+                            "pointer" : 114,
                             "source_range" : (
                               {
                                 "column" : 23
@@ -2261,7 +2283,7 @@
                           [
                             <"ObjCBridgedCastExpr" : (
                               {
-                                "pointer" : 113,
+                                "pointer" : 115,
                                 "source_range" : (
                                   {
                                     "column" : 23
@@ -2274,7 +2296,7 @@
                               [
                                 <"CallExpr" : (
                                   {
-                                    "pointer" : 114,
+                                    "pointer" : 116,
                                     "source_range" : (
                                       {
                                         "column" : 51
@@ -2287,7 +2309,7 @@
                                   [
                                     <"ImplicitCastExpr" : (
                                       {
-                                        "pointer" : 115,
+                                        "pointer" : 117,
                                         "source_range" : (
                                           {
                                             "column" : 51
@@ -2300,7 +2322,7 @@
                                       [
                                         <"DeclRefExpr" : (
                                           {
-                                            "pointer" : 116,
+                                            "pointer" : 118,
                                             "source_range" : (
                                               {
                                                 "column" : 51
@@ -2314,13 +2336,13 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 101
+                                              "type_ptr" : 103
                                             }
                                           },
                                           {
                                             "decl_ref" : {
                                               "kind" : <"Function">,
-                                              "decl_pointer" : 100,
+                                              "decl_pointer" : 102,
                                               "name" : {
                                                 "name" : "ABFDataCreate",
                                                 "qual_name" : [
@@ -2328,7 +2350,7 @@
                                                 ]
                                               },
                                               "qual_type" : {
-                                                "type_ptr" : 101
+                                                "type_ptr" : 103
                                               }
                                             }
                                           }
@@ -2336,7 +2358,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 117
+                                          "type_ptr" : 119
                                         }
                                       },
                                       {
@@ -2348,14 +2370,14 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 118
+                                      "type_ptr" : 120
                                     }
                                   }
                                 )>
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 119
+                                  "type_ptr" : 121
                                 }
                               },
                               {
@@ -2364,7 +2386,7 @@
                                 ]
                               },
                               {
-                                "type_ptr" : 119
+                                "type_ptr" : 121
                               },
                               {
                                 "cast_kind" : <"OBC_BridgeTransfer">
@@ -2373,7 +2395,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 119
+                              "type_ptr" : 121
                             }
                           },
                           {
@@ -2385,7 +2407,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 119
+                          "type_ptr" : 121
                         }
                       },
                       {
@@ -2395,7 +2417,7 @@
                   [
                     <"VarDecl" : (
                       {
-                        "pointer" : 120,
+                        "pointer" : 122,
                         "source_range" : (
                           {
                             "column" : 3
@@ -2412,12 +2434,12 @@
                         ]
                       },
                       {
-                        "type_ptr" : 119
+                        "type_ptr" : 121
                       },
                       {
                         "init_expr" : <"ExprWithCleanups" : (
                           {
-                            "pointer" : 111,
+                            "pointer" : 113,
                             "source_range" : (
                               {
                                 "column" : 23
@@ -2430,7 +2452,7 @@
                           [
                             <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 112,
+                                "pointer" : 114,
                                 "source_range" : (
                                   {
                                     "column" : 23
@@ -2443,7 +2465,7 @@
                               [
                                 <"ObjCBridgedCastExpr" : (
                                   {
-                                    "pointer" : 113,
+                                    "pointer" : 115,
                                     "source_range" : (
                                       {
                                         "column" : 23
@@ -2456,7 +2478,7 @@
                                   [
                                     <"CallExpr" : (
                                       {
-                                        "pointer" : 114,
+                                        "pointer" : 116,
                                         "source_range" : (
                                           {
                                             "column" : 51
@@ -2469,7 +2491,7 @@
                                       [
                                         <"ImplicitCastExpr" : (
                                           {
-                                            "pointer" : 115,
+                                            "pointer" : 117,
                                             "source_range" : (
                                               {
                                                 "column" : 51
@@ -2482,7 +2504,7 @@
                                           [
                                             <"DeclRefExpr" : (
                                               {
-                                                "pointer" : 116,
+                                                "pointer" : 118,
                                                 "source_range" : (
                                                   {
                                                     "column" : 51
@@ -2496,13 +2518,13 @@
                                               ],
                                               {
                                                 "qual_type" : {
-                                                  "type_ptr" : 101
+                                                  "type_ptr" : 103
                                                 }
                                               },
                                               {
                                                 "decl_ref" : {
                                                   "kind" : <"Function">,
-                                                  "decl_pointer" : 100,
+                                                  "decl_pointer" : 102,
                                                   "name" : {
                                                     "name" : "ABFDataCreate",
                                                     "qual_name" : [
@@ -2510,7 +2532,7 @@
                                                     ]
                                                   },
                                                   "qual_type" : {
-                                                    "type_ptr" : 101
+                                                    "type_ptr" : 103
                                                   }
                                                 }
                                               }
@@ -2518,7 +2540,7 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 117
+                                              "type_ptr" : 119
                                             }
                                           },
                                           {
@@ -2530,14 +2552,14 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 118
+                                          "type_ptr" : 120
                                         }
                                       }
                                     )>
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 119
+                                      "type_ptr" : 121
                                     }
                                   },
                                   {
@@ -2546,7 +2568,7 @@
                                     ]
                                   },
                                   {
-                                    "type_ptr" : 119
+                                    "type_ptr" : 121
                                   },
                                   {
                                     "cast_kind" : <"OBC_BridgeTransfer">
@@ -2555,7 +2577,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 119
+                                  "type_ptr" : 121
                                 }
                               },
                               {
@@ -2567,7 +2589,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 119
+                              "type_ptr" : 121
                             }
                           },
                           {
@@ -2588,7 +2610,7 @@
       {
         "class_interface" : {
           "kind" : <"ObjCInterface">,
-          "decl_pointer" : 102,
+          "decl_pointer" : 104,
           "name" : {
             "name" : "A",
             "qual_name" : [
@@ -2600,7 +2622,7 @@
     )>,
     <"TypedefDecl" : (
       {
-        "pointer" : 121,
+        "pointer" : 123,
         "source_range" : (
           {
           },
@@ -2636,31 +2658,31 @@
     "types" : [
       <"BuiltinType" : (
         {
-          "pointer" : 105
+          "pointer" : 107
         },
         <"Void">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 122
+          "pointer" : 124
         },
         <"Bool">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 123
+          "pointer" : 125
         },
         <"Char_S">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 124
+          "pointer" : 126
         },
         <"SChar">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 125
+          "pointer" : 127
         },
         <"Short">
       )>,
@@ -2672,25 +2694,25 @@
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 126
+          "pointer" : 128
         },
         <"Long">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 127
+          "pointer" : 129
         },
         <"LongLong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 128
+          "pointer" : 130
         },
         <"UChar">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 129
+          "pointer" : 131
         },
         <"UShort">
       )>,
@@ -2702,369 +2724,375 @@
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 130
+          "pointer" : 132
         },
         <"ULong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 131
+          "pointer" : 133
         },
         <"ULongLong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 132
+          "pointer" : 134
         },
         <"Float">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 133
+          "pointer" : 135
         },
         <"Double">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 134
+          "pointer" : 136
         },
         <"LongDouble">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 135
+          "pointer" : 137
         },
         <"Float128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 136
+          "pointer" : 138
         },
         <"Float16">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 137
+          "pointer" : 139
         },
         <"ShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 138
+          "pointer" : 140
         },
         <"Accum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 139
+          "pointer" : 141
         },
         <"LongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 140
+          "pointer" : 142
         },
         <"UShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 141
+          "pointer" : 143
         },
         <"UAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 142
+          "pointer" : 144
         },
         <"ULongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 143
+          "pointer" : 145
         },
         <"ShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 144
+          "pointer" : 146
         },
         <"Fract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 145
+          "pointer" : 147
         },
         <"LongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 146
+          "pointer" : 148
         },
         <"UShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 147
+          "pointer" : 149
         },
         <"UFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 148
+          "pointer" : 150
         },
         <"ULongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 149
+          "pointer" : 151
         },
         <"SatShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 150
+          "pointer" : 152
         },
         <"SatAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 151
+          "pointer" : 153
         },
         <"SatLongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 152
+          "pointer" : 154
         },
         <"SatUShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 153
+          "pointer" : 155
         },
         <"SatUAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 154
+          "pointer" : 156
         },
         <"SatULongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 155
+          "pointer" : 157
         },
         <"SatShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 156
+          "pointer" : 158
         },
         <"SatFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 157
+          "pointer" : 159
         },
         <"SatLongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 158
+          "pointer" : 160
         },
         <"SatUShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 159
+          "pointer" : 161
         },
         <"SatUFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 160
+          "pointer" : 162
         },
         <"SatULongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 161
+          "pointer" : 163
         },
         <"Int128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 162
+          "pointer" : 164
         },
         <"UInt128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 163
+          "pointer" : 165
         },
         <"WChar_S">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 164
+          "pointer" : 166
         },
         <"Char8">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 165
+          "pointer" : 167
         },
         <"Dependent">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 166
+          "pointer" : 168
         },
         <"Overload">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 167
+          "pointer" : 169
         },
         <"BoundMember">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 168
+          "pointer" : 170
         },
         <"PseudoObject">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 169
+          "pointer" : 171
         },
         <"UnknownAny">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 170
+          "pointer" : 172
         },
         <"ARCUnbridgedCast">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 171
+          "pointer" : 173
         },
         <"BuiltinFn">
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 172
+          "pointer" : 174
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 173
+          "pointer" : 175
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 174
+          "pointer" : 176
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 175
+          "pointer" : 177
         }
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 176
+          "pointer" : 178
         },
         <"ObjCId">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 177
+          "pointer" : 179
         },
         <"ObjCClass">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 178
+          "pointer" : 180
         },
         <"ObjCSel">
       )>,
       <"PointerType" : (
         {
-          "pointer" : 179
+          "pointer" : 181
         },
         {
-          "type_ptr" : 105
+          "type_ptr" : 107
         }
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 180
+          "pointer" : 182
         },
         <"NullPtr">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 181
+          "pointer" : 183
         },
         <"Half">
       )>,
+      <"BuiltinType" : (
+        {
+          "pointer" : 184
+        },
+        <"BFloat16">
+      )>,
       <"PointerType" : (
         {
-          "pointer" : 182
+          "pointer" : 185
         },
         {
-          "type_ptr" : 178
+          "type_ptr" : 180
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 183
+          "pointer" : 186
         },
         {
-          "base_type" : 176
+          "base_type" : 178
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 184
+          "pointer" : 187
         },
         {
-          "type_ptr" : 183
+          "type_ptr" : 186
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 185
+          "pointer" : 188
         },
         {
-          "base_type" : 177
+          "base_type" : 179
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 186
+          "pointer" : 189
         },
         {
-          "type_ptr" : 185
+          "type_ptr" : 188
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 187
+          "pointer" : 190
         },
         10
       )>,
       <"RecordType" : (
         {
-          "pointer" : 188
+          "pointer" : 191
         },
-        189
+        192
       )>,
       <"PointerType" : (
         {
-          "pointer" : 190
+          "pointer" : 193
         },
         {
           "type_ptr" : 53,
@@ -3073,34 +3101,34 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 191
+          "pointer" : 194
         },
         {
-          "type_ptr" : 123,
+          "type_ptr" : 125,
           "is_const" : true
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 192
+          "pointer" : 195
         },
         {
-          "type_ptr" : 123
+          "type_ptr" : 125
         }
       )>,
       <"RecordType" : (
         {
-          "pointer" : 193
+          "pointer" : 196
         },
-        194
+        197
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 195
+          "pointer" : 198
         },
         {
           "element_type" : {
-            "type_ptr" : 193
+            "type_ptr" : 196
           },
           "stride" : 24
         },
@@ -3108,18 +3136,18 @@
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 196
+          "pointer" : 199
         },
         18
       )>,
       <"TypedefType" : (
         {
           "pointer" : 7,
-          "desugared_type" : 184
+          "desugared_type" : 187
         },
         {
           "child_type" : {
-            "type_ptr" : 184
+            "type_ptr" : 187
           },
           "decl_ptr" : 6
         }
@@ -3127,23 +3155,23 @@
       <"TypedefType" : (
         {
           "pointer" : 21,
-          "desugared_type" : 184
+          "desugared_type" : 187
         },
         {
           "child_type" : {
             "type_ptr" : 7
           },
-          "decl_ptr" : 121
+          "decl_ptr" : 123
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 9,
-          "desugared_type" : 186
+          "desugared_type" : 189
         },
         {
           "child_type" : {
-            "type_ptr" : 186
+            "type_ptr" : 189
           },
           "decl_ptr" : 8
         }
@@ -3151,11 +3179,11 @@
       <"TypedefType" : (
         {
           "pointer" : 5,
-          "desugared_type" : 182
+          "desugared_type" : 185
         },
         {
           "child_type" : {
-            "type_ptr" : 182
+            "type_ptr" : 185
           },
           "decl_ptr" : 4
         }
@@ -3165,7 +3193,7 @@
           "pointer" : 30
         },
         {
-          "type_ptr" : 196
+          "type_ptr" : 199
         }
       )>,
       <"TypedefType" : (
@@ -3185,18 +3213,18 @@
           "pointer" : 47
         },
         {
-          "type_ptr" : 187
+          "type_ptr" : 190
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 197
+          "pointer" : 200
         },
         50
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 198
+          "pointer" : 201
         },
         56
       )>,
@@ -3217,29 +3245,29 @@
           "pointer" : 59
         },
         {
-          "type_ptr" : 198
+          "type_ptr" : 201
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 199
+          "pointer" : 202
         },
         61
       )>,
       <"IncompleteArrayType" : (
         {
-          "pointer" : 200
+          "pointer" : 203
         },
         {
           "element_type" : {
-            "type_ptr" : 184
+            "type_ptr" : 187
           },
           "stride" : 8
         }
       )>,
       <"IncompleteArrayType" : (
         {
-          "pointer" : 201
+          "pointer" : 204
         },
         {
           "element_type" : {
@@ -3251,7 +3279,7 @@
       )>,
       <"IncompleteArrayType" : (
         {
-          "pointer" : 202
+          "pointer" : 205
         },
         {
           "element_type" : {
@@ -3263,16 +3291,16 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 203
+          "pointer" : 206
         },
         {
-          "type_ptr" : 184,
+          "type_ptr" : 187,
           "is_const" : true
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 204
+          "pointer" : 207
         },
         {
           "type_ptr" : 7,
@@ -3282,10 +3310,10 @@
       <"DecayedType" : (
         {
           "pointer" : 64,
-          "desugared_type" : 204
+          "desugared_type" : 207
         },
         {
-          "type_ptr" : 204
+          "type_ptr" : 207
         }
       )>,
       <"ObjCObjectPointerType" : (
@@ -3293,21 +3321,21 @@
           "pointer" : 72
         },
         {
-          "type_ptr" : 199
+          "type_ptr" : 202
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 205
+          "pointer" : 208
         },
         74
       )>,
       <"PointerType" : (
         {
-          "pointer" : 206
+          "pointer" : 209
         },
         {
-          "type_ptr" : 184
+          "type_ptr" : 187
         }
       )>,
       <"PointerType" : (
@@ -3323,22 +3351,22 @@
           "pointer" : 85
         },
         {
-          "type_ptr" : 205
+          "type_ptr" : 208
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 207
+          "pointer" : 210
         },
         87
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 208
+          "pointer" : 211
         },
         {
           "return_type" : {
-            "type_ptr" : 105
+            "type_ptr" : 107
           }
         },
         {
@@ -3351,11 +3379,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 209
+          "pointer" : 212
         },
         {
           "return_type" : {
-            "type_ptr" : 105
+            "type_ptr" : 107
           }
         },
         {
@@ -3368,28 +3396,28 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 210
+          "pointer" : 213
         },
         {
           "return_type" : {
-            "type_ptr" : 105
+            "type_ptr" : 107
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 184
+              "type_ptr" : 187
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "return_type" : {
-            "type_ptr" : 105
+            "type_ptr" : 107
           }
         },
         {
@@ -3402,106 +3430,106 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 96
+          "pointer" : 98
         },
-        95
+        97
       )>,
       <"ElaboratedType" : (
         {
-          "pointer" : 211,
-          "desugared_type" : 96
+          "pointer" : 214,
+          "desugared_type" : 98
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 212
+          "pointer" : 215
         },
-        99
+        101
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 98,
-          "desugared_type" : 96
+          "pointer" : 100,
+          "desugared_type" : 98
         },
         {
           "child_type" : {
-            "type_ptr" : 211
+            "type_ptr" : 214
           },
-          "decl_ptr" : 97
+          "decl_ptr" : 99
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 213
+          "pointer" : 216
         },
         {
-          "type_ptr" : 96
+          "type_ptr" : 98
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 118
+          "pointer" : 120
         },
         {
-          "type_ptr" : 98
+          "type_ptr" : 100
         }
       )>,
       <"FunctionNoProtoType" : (
         {
-          "pointer" : 214
+          "pointer" : 217
         },
         {
           "return_type" : {
-            "type_ptr" : 213
+            "type_ptr" : 216
           }
         }
       )>,
       <"FunctionNoProtoType" : (
         {
-          "pointer" : 101
+          "pointer" : 103
         },
         {
           "return_type" : {
-            "type_ptr" : 118
+            "type_ptr" : 120
           }
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 215
+          "pointer" : 218
         },
-        102
+        104
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 107
+          "pointer" : 109
         },
         {
-          "type_ptr" : 215
+          "type_ptr" : 218
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 119
+          "pointer" : 121
         },
         {
-          "type_ptr" : 212
+          "type_ptr" : 215
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 216
+          "pointer" : 219
         },
         {
-          "type_ptr" : 214
+          "type_ptr" : 217
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 117
+          "pointer" : 119
         },
         {
-          "type_ptr" : 101
+          "type_ptr" : 103
         }
       )>,
       <"NoneType" : (
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCTest.m.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCTest.m.exp
index b994da519..21fceae60 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCTest.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCTest.m.exp
@@ -1826,9 +1826,20 @@
         "is_implicit" : true,
         "is_used" : true,
         "attributes" : [
-          <"FormatAttr" : (
+          <"BuiltinAttr" : (
             {
               "pointer" : 89,
+              "source_range" : (
+                {
+                },
+                {
+                }
+              )
+            }
+          )>,
+          <"FormatAttr" : (
+            {
+              "pointer" : 90,
               "source_range" : (
                 {
                   "column" : 13
@@ -1848,14 +1859,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 91,
+              "pointer" : 92,
               "source_range" : (
                 {
                 },
@@ -1881,7 +1892,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 92,
+        "pointer" : 93,
         "source_range" : (
           {
             "column" : 1
@@ -1893,9 +1904,20 @@
         "is_used" : true,
         "is_this_declaration_referenced" : true,
         "attributes" : [
+          <"BuiltinAttr" : (
+            {
+              "pointer" : 94,
+              "source_range" : (
+                {
+                },
+                {
+                }
+              )
+            }
+          )>,
           <"FormatAttr" : (
             {
-              "pointer" : 93,
+              "pointer" : 95,
               "source_range" : (
                 {
                   "column" : 13
@@ -1915,14 +1937,14 @@
         ]
       },
       {
-        "type_ptr" : 90
+        "type_ptr" : 91
       },
       {
         "is_variadic" : true,
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 94,
+              "pointer" : 96,
               "source_range" : (
                 {
                   "column" : 19
@@ -1950,7 +1972,7 @@
     )>,
     <"ObjCProtocolDecl" : (
       {
-        "pointer" : 95,
+        "pointer" : 97,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -1973,8 +1995,8 @@
       [
         <"ObjCPropertyDecl" : (
           {
-            "pointer" : 96,
-            "parent_pointer" : 95,
+            "pointer" : 98,
+            "parent_pointer" : 97,
             "source_range" : (
               {
                 "line" : 11,
@@ -1998,7 +2020,7 @@
             },
             "getter_method" : {
               "kind" : <"ObjCMethod">,
-              "decl_pointer" : 97,
+              "decl_pointer" : 99,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2009,7 +2031,7 @@
             },
             "setter_method" : {
               "kind" : <"ObjCMethod">,
-              "decl_pointer" : 98,
+              "decl_pointer" : 100,
               "name" : {
                 "name" : "setStr:",
                 "qual_name" : [
@@ -2027,8 +2049,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 97,
-            "parent_pointer" : 95,
+            "pointer" : 99,
+            "parent_pointer" : 97,
             "source_range" : (
               {
                 "column" : 38
@@ -2054,7 +2076,7 @@
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 96,
+              "decl_pointer" : 98,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2066,7 +2088,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 99,
+                  "pointer" : 101,
                   "source_range" : (
                     {
                     },
@@ -2090,7 +2112,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 100,
+                  "pointer" : 102,
                   "source_range" : (
                     {
                     },
@@ -2117,8 +2139,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 98,
-            "parent_pointer" : 95,
+            "pointer" : 100,
+            "parent_pointer" : 97,
             "source_range" : (
               {
                 "column" : 38
@@ -2139,12 +2161,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 96,
+              "decl_pointer" : 98,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2156,7 +2178,7 @@
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 102,
+                  "pointer" : 104,
                   "source_range" : (
                     {
                       "column" : 38
@@ -2183,7 +2205,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 103,
+                  "pointer" : 105,
                   "source_range" : (
                     {
                     },
@@ -2207,7 +2229,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 104,
+                  "pointer" : 106,
                   "source_range" : (
                     {
                     },
@@ -2240,7 +2262,7 @@
     )>,
     <"ObjCProtocolDecl" : (
       {
-        "pointer" : 105,
+        "pointer" : 107,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -2267,7 +2289,7 @@
     )>,
     <"ObjCInterfaceDecl" : (
       {
-        "pointer" : 106,
+        "pointer" : 108,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -2289,8 +2311,8 @@
       [
         <"ObjCPropertyDecl" : (
           {
-            "pointer" : 107,
-            "parent_pointer" : 106,
+            "pointer" : 109,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "line" : 18,
@@ -2314,7 +2336,7 @@
             },
             "getter_method" : {
               "kind" : <"ObjCMethod">,
-              "decl_pointer" : 108,
+              "decl_pointer" : 110,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2325,7 +2347,7 @@
             },
             "setter_method" : {
               "kind" : <"ObjCMethod">,
-              "decl_pointer" : 109,
+              "decl_pointer" : 111,
               "name" : {
                 "name" : "setStr:",
                 "qual_name" : [
@@ -2336,7 +2358,7 @@
             },
             "ivar_decl" : {
               "kind" : <"ObjCIvar">,
-              "decl_pointer" : 110,
+              "decl_pointer" : 112,
               "name" : {
                 "name" : "_str",
                 "qual_name" : [
@@ -2357,8 +2379,8 @@
         )>,
         <"ObjCPropertyDecl" : (
           {
-            "pointer" : 111,
-            "parent_pointer" : 106,
+            "pointer" : 113,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "line" : 20,
@@ -2378,11 +2400,11 @@
           },
           {
             "qual_type" : {
-              "type_ptr" : 112
+              "type_ptr" : 114
             },
             "getter_method" : {
               "kind" : <"ObjCMethod">,
-              "decl_pointer" : 113,
+              "decl_pointer" : 115,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -2393,7 +2415,7 @@
             },
             "setter_method" : {
               "kind" : <"ObjCMethod">,
-              "decl_pointer" : 114,
+              "decl_pointer" : 116,
               "name" : {
                 "name" : "setX:",
                 "qual_name" : [
@@ -2404,7 +2426,7 @@
             },
             "ivar_decl" : {
               "kind" : <"ObjCIvar">,
-              "decl_pointer" : 115,
+              "decl_pointer" : 117,
               "name" : {
                 "name" : "_x",
                 "qual_name" : [
@@ -2413,7 +2435,7 @@
                 ]
               },
               "qual_type" : {
-                "type_ptr" : 112
+                "type_ptr" : 114
               }
             },
             "property_attributes" : [
@@ -2426,8 +2448,8 @@
         )>,
         <"ObjCPropertyDecl" : (
           {
-            "pointer" : 116,
-            "parent_pointer" : 106,
+            "pointer" : 118,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "line" : 21,
@@ -2451,7 +2473,7 @@
             },
             "getter_method" : {
               "kind" : <"ObjCMethod">,
-              "decl_pointer" : 117,
+              "decl_pointer" : 119,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -2462,7 +2484,7 @@
             },
             "setter_method" : {
               "kind" : <"ObjCMethod">,
-              "decl_pointer" : 118,
+              "decl_pointer" : 120,
               "name" : {
                 "name" : "setY:",
                 "qual_name" : [
@@ -2473,7 +2495,7 @@
             },
             "ivar_decl" : {
               "kind" : <"ObjCIvar">,
-              "decl_pointer" : 119,
+              "decl_pointer" : 121,
               "name" : {
                 "name" : "_y",
                 "qual_name" : [
@@ -2495,8 +2517,8 @@
         )>,
         <"ObjCPropertyDecl" : (
           {
-            "pointer" : 120,
-            "parent_pointer" : 106,
+            "pointer" : 122,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "line" : 22,
@@ -2516,11 +2538,11 @@
           },
           {
             "qual_type" : {
-              "type_ptr" : 121
+              "type_ptr" : 123
             },
             "getter_method" : {
               "kind" : <"ObjCMethod">,
-              "decl_pointer" : 122,
+              "decl_pointer" : 124,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -2531,7 +2553,7 @@
             },
             "setter_method" : {
               "kind" : <"ObjCMethod">,
-              "decl_pointer" : 123,
+              "decl_pointer" : 125,
               "name" : {
                 "name" : "setDelegate:",
                 "qual_name" : [
@@ -2542,7 +2564,7 @@
             },
             "ivar_decl" : {
               "kind" : <"ObjCIvar">,
-              "decl_pointer" : 124,
+              "decl_pointer" : 126,
               "name" : {
                 "name" : "_delegate",
                 "qual_name" : [
@@ -2551,7 +2573,7 @@
                 ]
               },
               "qual_type" : {
-                "type_ptr" : 121
+                "type_ptr" : 123
               }
             },
             "property_attributes" : [
@@ -2564,8 +2586,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 108,
-            "parent_pointer" : 106,
+            "pointer" : 110,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "line" : 18,
@@ -2592,7 +2614,7 @@
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 107,
+              "decl_pointer" : 109,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2604,7 +2626,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 125,
+                  "pointer" : 127,
                   "source_range" : (
                     {
                     },
@@ -2620,7 +2642,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -2628,7 +2650,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 127,
+                  "pointer" : 129,
                   "source_range" : (
                     {
                     },
@@ -2656,8 +2678,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 109,
-            "parent_pointer" : 106,
+            "pointer" : 111,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "column" : 38
@@ -2678,12 +2700,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 107,
+              "decl_pointer" : 109,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -2695,7 +2717,7 @@
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 128,
+                  "pointer" : 130,
                   "source_range" : (
                     {
                       "column" : 38
@@ -2722,7 +2744,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 129,
+                  "pointer" : 131,
                   "source_range" : (
                     {
                     },
@@ -2738,7 +2760,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -2746,7 +2768,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 130,
+                  "pointer" : 132,
                   "source_range" : (
                     {
                     },
@@ -2774,8 +2796,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 113,
-            "parent_pointer" : 106,
+            "pointer" : 115,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "line" : 20,
@@ -2797,12 +2819,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 112
+              "type_ptr" : 114
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 111,
+              "decl_pointer" : 113,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -2814,7 +2836,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 131,
+                  "pointer" : 133,
                   "source_range" : (
                     {
                     },
@@ -2830,7 +2852,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -2838,7 +2860,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 132,
+                  "pointer" : 134,
                   "source_range" : (
                     {
                     },
@@ -2865,8 +2887,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 114,
-            "parent_pointer" : 106,
+            "pointer" : 116,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "column" : 36
@@ -2887,12 +2909,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 111,
+              "decl_pointer" : 113,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -2904,7 +2926,7 @@
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 133,
+                  "pointer" : 135,
                   "source_range" : (
                     {
                       "column" : 36
@@ -2921,7 +2943,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 112
+                  "type_ptr" : 114
                 },
                 {
                   "parm_index_in_function" : 0
@@ -2931,7 +2953,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 134,
+                  "pointer" : 136,
                   "source_range" : (
                     {
                     },
@@ -2947,7 +2969,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -2955,7 +2977,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 135,
+                  "pointer" : 137,
                   "source_range" : (
                     {
                     },
@@ -2982,8 +3004,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 117,
-            "parent_pointer" : 106,
+            "pointer" : 119,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "line" : 21,
@@ -3010,7 +3032,7 @@
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 116,
+              "decl_pointer" : 118,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -3022,7 +3044,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 136,
+                  "pointer" : 138,
                   "source_range" : (
                     {
                     },
@@ -3038,7 +3060,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3046,7 +3068,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 137,
+                  "pointer" : 139,
                   "source_range" : (
                     {
                     },
@@ -3073,8 +3095,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 118,
-            "parent_pointer" : 106,
+            "pointer" : 120,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "column" : 34
@@ -3095,12 +3117,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 116,
+              "decl_pointer" : 118,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -3112,7 +3134,7 @@
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 138,
+                  "pointer" : 140,
                   "source_range" : (
                     {
                       "column" : 34
@@ -3139,7 +3161,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 139,
+                  "pointer" : 141,
                   "source_range" : (
                     {
                     },
@@ -3155,7 +3177,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3163,7 +3185,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 140,
+                  "pointer" : 142,
                   "source_range" : (
                     {
                     },
@@ -3190,8 +3212,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 122,
-            "parent_pointer" : 106,
+            "pointer" : 124,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "line" : 22,
@@ -3213,12 +3235,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 121
+              "type_ptr" : 123
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 120,
+              "decl_pointer" : 122,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -3230,7 +3252,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 141,
+                  "pointer" : 143,
                   "source_range" : (
                     {
                     },
@@ -3246,7 +3268,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3254,7 +3276,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 142,
+                  "pointer" : 144,
                   "source_range" : (
                     {
                     },
@@ -3281,8 +3303,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 123,
-            "parent_pointer" : 106,
+            "pointer" : 125,
+            "parent_pointer" : 108,
             "source_range" : (
               {
                 "column" : 54
@@ -3303,12 +3325,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 120,
+              "decl_pointer" : 122,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -3320,7 +3342,7 @@
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 143,
+                  "pointer" : 145,
                   "source_range" : (
                     {
                       "column" : 54
@@ -3337,7 +3359,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 121
+                  "type_ptr" : 123
                 },
                 {
                   "parm_index_in_function" : 0
@@ -3347,7 +3369,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 144,
+                  "pointer" : 146,
                   "source_range" : (
                     {
                     },
@@ -3363,7 +3385,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3371,7 +3393,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 145,
+                  "pointer" : 147,
                   "source_range" : (
                     {
                     },
@@ -3412,7 +3434,7 @@
         },
         "implementation" : {
           "kind" : <"ObjCImplementation">,
-          "decl_pointer" : 146,
+          "decl_pointer" : 148,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -3423,7 +3445,7 @@
         "protocols" : [
           {
             "kind" : <"ObjCProtocol">,
-            "decl_pointer" : 95,
+            "decl_pointer" : 97,
             "name" : {
               "name" : "MyProtocol",
               "qual_name" : [
@@ -3435,7 +3457,7 @@
         "known_categories" : [
           {
             "kind" : <"ObjCCategory">,
-            "decl_pointer" : 147,
+            "decl_pointer" : 149,
             "name" : {
               "name" : "MyCategory",
               "qual_name" : [
@@ -3445,7 +3467,7 @@
           },
           {
             "kind" : <"ObjCCategory">,
-            "decl_pointer" : 148,
+            "decl_pointer" : 150,
             "name" : {
               "name" : "",
               "qual_name" : [
@@ -3458,7 +3480,7 @@
     )>,
     <"ObjCCategoryDecl" : (
       {
-        "pointer" : 148,
+        "pointer" : 150,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -3480,8 +3502,8 @@
       [
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 149,
-            "parent_pointer" : 148,
+            "pointer" : 151,
+            "parent_pointer" : 150,
             "source_range" : (
               {
                 "line" : 28,
@@ -3502,12 +3524,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 150,
+                  "pointer" : 152,
                   "source_range" : (
                     {
                       "column" : 14
@@ -3524,7 +3546,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 151
+                  "type_ptr" : 153
                 },
                 {
                   "parm_index_in_function" : 0
@@ -3534,7 +3556,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 152,
+                  "pointer" : 154,
                   "source_range" : (
                     {
                     },
@@ -3550,7 +3572,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3558,7 +3580,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 153,
+                  "pointer" : 155,
                   "source_range" : (
                     {
                     },
@@ -3589,7 +3611,7 @@
       {
         "class_interface" : {
           "kind" : <"ObjCInterface">,
-          "decl_pointer" : 106,
+          "decl_pointer" : 108,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -3601,7 +3623,7 @@
     )>,
     <"ObjCImplementationDecl" : (
       {
-        "pointer" : 146,
+        "pointer" : 148,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -3623,8 +3645,8 @@
       [
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 154,
-            "parent_pointer" : 146,
+            "pointer" : 156,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "line" : 34,
@@ -3646,12 +3668,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 155,
+                  "pointer" : 157,
                   "source_range" : (
                     {
                       "line" : 34,
@@ -3669,7 +3691,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 151
+                  "type_ptr" : 153
                 },
                 {
                   "parm_index_in_function" : 0
@@ -3679,7 +3701,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 156,
+                  "pointer" : 158,
                   "source_range" : (
                     {
                     },
@@ -3697,7 +3719,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -3705,7 +3727,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 157,
+                  "pointer" : 159,
                   "source_range" : (
                     {
                     },
@@ -3729,7 +3751,7 @@
             ],
             "body" : <"CompoundStmt" : (
               {
-                "pointer" : 158,
+                "pointer" : 160,
                 "source_range" : (
                   {
                     "column" : 36
@@ -3743,7 +3765,7 @@
               [
                 <"CallExpr" : (
                   {
-                    "pointer" : 159,
+                    "pointer" : 161,
                     "source_range" : (
                       {
                         "line" : 36,
@@ -3757,7 +3779,7 @@
                   [
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 160,
+                        "pointer" : 162,
                         "source_range" : (
                           {
                             "column" : 3
@@ -3770,7 +3792,7 @@
                       [
                         <"DeclRefExpr" : (
                           {
-                            "pointer" : 161,
+                            "pointer" : 163,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -3784,13 +3806,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 90
+                              "type_ptr" : 91
                             }
                           },
                           {
                             "decl_ref" : {
                               "kind" : <"Function">,
-                              "decl_pointer" : 92,
+                              "decl_pointer" : 93,
                               "name" : {
                                 "name" : "NSLog",
                                 "qual_name" : [
@@ -3798,7 +3820,7 @@
                                 ]
                               },
                               "qual_type" : {
-                                "type_ptr" : 90
+                                "type_ptr" : 91
                               }
                             }
                           }
@@ -3806,7 +3828,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 162
+                          "type_ptr" : 164
                         }
                       },
                       {
@@ -3817,7 +3839,7 @@
                     )>,
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 163,
+                        "pointer" : 165,
                         "source_range" : (
                           {
                             "column" : 9
@@ -3830,7 +3852,7 @@
                       [
                         <"ObjCStringLiteral" : (
                           {
-                            "pointer" : 164,
+                            "pointer" : 166,
                             "source_range" : (
                               {
                                 "column" : 9
@@ -3843,7 +3865,7 @@
                           [
                             <"StringLiteral" : (
                               {
-                                "pointer" : 165,
+                                "pointer" : 167,
                                 "source_range" : (
                                   {
                                     "column" : 10
@@ -3857,7 +3879,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 166
+                                  "type_ptr" : 168
                                 },
                                 "value_kind" : <"LValue">
                               },
@@ -3886,7 +3908,7 @@
                     )>,
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 167,
+                        "pointer" : 169,
                         "source_range" : (
                           {
                             "column" : 18
@@ -3899,7 +3921,7 @@
                       [
                         <"ObjCEncodeExpr" : (
                           {
-                            "pointer" : 168,
+                            "pointer" : 170,
                             "source_range" : (
                               {
                                 "column" : 18
@@ -3913,13 +3935,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 166
+                              "type_ptr" : 168
                             },
                             "value_kind" : <"LValue">
                           },
                           {
                             "qual_type" : {
-                              "type_ptr" : 169
+                              "type_ptr" : 171
                             },
                             "raw" : "int **"
                           }
@@ -3927,7 +3949,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 170
+                          "type_ptr" : 172
                         }
                       },
                       {
@@ -3939,13 +3961,13 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 101
+                      "type_ptr" : 103
                     }
                   }
                 )>,
                 <"CallExpr" : (
                   {
-                    "pointer" : 171,
+                    "pointer" : 173,
                     "source_range" : (
                       {
                         "line" : 38,
@@ -3959,7 +3981,7 @@
                   [
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 172,
+                        "pointer" : 174,
                         "source_range" : (
                           {
                             "column" : 3
@@ -3972,7 +3994,7 @@
                       [
                         <"DeclRefExpr" : (
                           {
-                            "pointer" : 173,
+                            "pointer" : 175,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -3986,13 +4008,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 90
+                              "type_ptr" : 91
                             }
                           },
                           {
                             "decl_ref" : {
                               "kind" : <"Function">,
-                              "decl_pointer" : 92,
+                              "decl_pointer" : 93,
                               "name" : {
                                 "name" : "NSLog",
                                 "qual_name" : [
@@ -4000,7 +4022,7 @@
                                 ]
                               },
                               "qual_type" : {
-                                "type_ptr" : 90
+                                "type_ptr" : 91
                               }
                             }
                           }
@@ -4008,7 +4030,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 162
+                          "type_ptr" : 164
                         }
                       },
                       {
@@ -4019,7 +4041,7 @@
                     )>,
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 174,
+                        "pointer" : 176,
                         "source_range" : (
                           {
                             "column" : 9
@@ -4032,7 +4054,7 @@
                       [
                         <"ObjCStringLiteral" : (
                           {
-                            "pointer" : 175,
+                            "pointer" : 177,
                             "source_range" : (
                               {
                                 "column" : 9
@@ -4045,7 +4067,7 @@
                           [
                             <"StringLiteral" : (
                               {
-                                "pointer" : 176,
+                                "pointer" : 178,
                                 "source_range" : (
                                   {
                                     "column" : 10
@@ -4059,7 +4081,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 166
+                                  "type_ptr" : 168
                                 },
                                 "value_kind" : <"LValue">
                               },
@@ -4088,7 +4110,7 @@
                     )>,
                     <"ObjCMessageExpr" : (
                       {
-                        "pointer" : 177,
+                        "pointer" : 179,
                         "source_range" : (
                           {
                             "column" : 18
@@ -4101,7 +4123,7 @@
                       [
                         <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 178,
+                            "pointer" : 180,
                             "source_range" : (
                               {
                                 "column" : 19
@@ -4114,7 +4136,7 @@
                           [
                             <"DeclRefExpr" : (
                               {
-                                "pointer" : 179,
+                                "pointer" : 181,
                                 "source_range" : (
                                   {
                                     "column" : 19
@@ -4128,7 +4150,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126,
+                                  "type_ptr" : 128,
                                   "is_const" : true
                                 },
                                 "value_kind" : <"LValue">
@@ -4136,7 +4158,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : <"ImplicitParam">,
-                                  "decl_pointer" : 156,
+                                  "decl_pointer" : 158,
                                   "name" : {
                                     "name" : "self",
                                     "qual_name" : [
@@ -4144,7 +4166,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 126,
+                                    "type_ptr" : 128,
                                     "is_const" : true
                                   }
                                 }
@@ -4153,7 +4175,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
@@ -4164,7 +4186,7 @@
                         )>,
                         <"ObjCSelectorExpr" : (
                           {
-                            "pointer" : 180,
+                            "pointer" : 182,
                             "source_range" : (
                               {
                                 "column" : 43
@@ -4197,13 +4219,13 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 101
+                      "type_ptr" : 103
                     }
                   }
                 )>,
                 <"CallExpr" : (
                   {
-                    "pointer" : 181,
+                    "pointer" : 183,
                     "source_range" : (
                       {
                         "line" : 40,
@@ -4217,7 +4239,7 @@
                   [
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 182,
+                        "pointer" : 184,
                         "source_range" : (
                           {
                             "column" : 3
@@ -4230,7 +4252,7 @@
                       [
                         <"DeclRefExpr" : (
                           {
-                            "pointer" : 183,
+                            "pointer" : 185,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -4244,13 +4266,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 90
+                              "type_ptr" : 91
                             }
                           },
                           {
                             "decl_ref" : {
                               "kind" : <"Function">,
-                              "decl_pointer" : 92,
+                              "decl_pointer" : 93,
                               "name" : {
                                 "name" : "NSLog",
                                 "qual_name" : [
@@ -4258,7 +4280,7 @@
                                 ]
                               },
                               "qual_type" : {
-                                "type_ptr" : 90
+                                "type_ptr" : 91
                               }
                             }
                           }
@@ -4266,7 +4288,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 162
+                          "type_ptr" : 164
                         }
                       },
                       {
@@ -4277,7 +4299,7 @@
                     )>,
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 184,
+                        "pointer" : 186,
                         "source_range" : (
                           {
                             "column" : 9
@@ -4290,7 +4312,7 @@
                       [
                         <"ObjCStringLiteral" : (
                           {
-                            "pointer" : 185,
+                            "pointer" : 187,
                             "source_range" : (
                               {
                                 "column" : 9
@@ -4303,7 +4325,7 @@
                           [
                             <"StringLiteral" : (
                               {
-                                "pointer" : 186,
+                                "pointer" : 188,
                                 "source_range" : (
                                   {
                                     "column" : 10
@@ -4317,7 +4339,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 166
+                                  "type_ptr" : 168
                                 },
                                 "value_kind" : <"LValue">
                               },
@@ -4346,7 +4368,7 @@
                     )>,
                     <"ObjCMessageExpr" : (
                       {
-                        "pointer" : 187,
+                        "pointer" : 189,
                         "source_range" : (
                           {
                             "column" : 18
@@ -4359,7 +4381,7 @@
                       [
                         <"ObjCMessageExpr" : (
                           {
-                            "pointer" : 188,
+                            "pointer" : 190,
                             "source_range" : (
                               {
                                 "column" : 19
@@ -4372,7 +4394,7 @@
                           [
                             <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 189,
+                                "pointer" : 191,
                                 "source_range" : (
                                   {
                                     "column" : 20
@@ -4385,7 +4407,7 @@
                               [
                                 <"DeclRefExpr" : (
                                   {
-                                    "pointer" : 190,
+                                    "pointer" : 192,
                                     "source_range" : (
                                       {
                                         "column" : 20
@@ -4399,7 +4421,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126,
+                                      "type_ptr" : 128,
                                       "is_const" : true
                                     },
                                     "value_kind" : <"LValue">
@@ -4407,7 +4429,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : <"ImplicitParam">,
-                                      "decl_pointer" : 156,
+                                      "decl_pointer" : 158,
                                       "name" : {
                                         "name" : "self",
                                         "qual_name" : [
@@ -4415,7 +4437,7 @@
                                         ]
                                       },
                                       "qual_type" : {
-                                        "type_ptr" : 126,
+                                        "type_ptr" : 128,
                                         "is_const" : true
                                       }
                                     }
@@ -4424,7 +4446,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -4446,7 +4468,7 @@
                         )>,
                         <"ObjCProtocolExpr" : (
                           {
-                            "pointer" : 191,
+                            "pointer" : 193,
                             "source_range" : (
                               {
                                 "column" : 51
@@ -4465,7 +4487,7 @@
                           },
                           {
                             "kind" : <"ObjCProtocol">,
-                            "decl_pointer" : 95,
+                            "decl_pointer" : 97,
                             "name" : {
                               "name" : "MyProtocol",
                               "qual_name" : [
@@ -4488,13 +4510,13 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 101
+                      "type_ptr" : 103
                     }
                   }
                 )>,
                 <"DeclStmt" : (
                   {
-                    "pointer" : 192,
+                    "pointer" : 194,
                     "source_range" : (
                       {
                         "line" : 42,
@@ -4509,7 +4531,7 @@
                   [
                     <"ExprWithCleanups" : (
                       {
-                        "pointer" : 193,
+                        "pointer" : 195,
                         "source_range" : (
                           {
                             "line" : 42,
@@ -4524,7 +4546,7 @@
                       [
                         <"BlockExpr" : (
                           {
-                            "pointer" : 194,
+                            "pointer" : 196,
                             "source_range" : (
                               {
                                 "line" : 42,
@@ -4540,13 +4562,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 195
+                              "type_ptr" : 197
                             }
                           },
                           <"BlockDecl" : (
                             {
-                              "pointer" : 196,
-                              "parent_pointer" : 154,
+                              "pointer" : 198,
+                              "parent_pointer" : 156,
                               "source_range" : (
                                 {
                                   "line" : 42,
@@ -4562,7 +4584,7 @@
                               "parameters" : [
                                 <"ParmVarDecl" : (
                                   {
-                                    "pointer" : 197,
+                                    "pointer" : 199,
                                     "source_range" : (
                                       {
                                         "line" : 42,
@@ -4593,7 +4615,7 @@
                                 {
                                   "variable" : {
                                     "kind" : <"ImplicitParam">,
-                                    "decl_pointer" : 156,
+                                    "decl_pointer" : 158,
                                     "name" : {
                                       "name" : "self",
                                       "qual_name" : [
@@ -4601,7 +4623,7 @@
                                       ]
                                     },
                                     "qual_type" : {
-                                      "type_ptr" : 126,
+                                      "type_ptr" : 128,
                                       "is_const" : true
                                     }
                                   }
@@ -4609,7 +4631,7 @@
                               ],
                               "body" : <"CompoundStmt" : (
                                 {
-                                  "pointer" : 198,
+                                  "pointer" : 200,
                                   "source_range" : (
                                     {
                                       "column" : 53
@@ -4623,7 +4645,7 @@
                                 [
                                   <"PseudoObjectExpr" : (
                                     {
-                                      "pointer" : 199,
+                                      "pointer" : 201,
                                       "source_range" : (
                                         {
                                           "line" : 43,
@@ -4637,7 +4659,7 @@
                                     [
                                       <"BinaryOperator" : (
                                         {
-                                          "pointer" : 200,
+                                          "pointer" : 202,
                                           "source_range" : (
                                             {
                                               "column" : 5
@@ -4650,7 +4672,7 @@
                                         [
                                           <"ObjCPropertyRefExpr" : (
                                             {
-                                              "pointer" : 201,
+                                              "pointer" : 203,
                                               "source_range" : (
                                                 {
                                                   "column" : 5
@@ -4663,7 +4685,7 @@
                                             [
                                               <"OpaqueValueExpr" : (
                                                 {
-                                                  "pointer" : 202,
+                                                  "pointer" : 204,
                                                   "source_range" : (
                                                     {
                                                       "column" : 5
@@ -4677,13 +4699,13 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 126
+                                                    "type_ptr" : 128
                                                   }
                                                 },
                                                 {
                                                   "source_expr" : <"ImplicitCastExpr" : (
                                                     {
-                                                      "pointer" : 203,
+                                                      "pointer" : 205,
                                                       "source_range" : (
                                                         {
                                                           "column" : 5
@@ -4696,7 +4718,7 @@
                                                     [
                                                       <"DeclRefExpr" : (
                                                         {
-                                                          "pointer" : 204,
+                                                          "pointer" : 206,
                                                           "source_range" : (
                                                             {
                                                               "column" : 5
@@ -4710,7 +4732,7 @@
                                                         ],
                                                         {
                                                           "qual_type" : {
-                                                            "type_ptr" : 126,
+                                                            "type_ptr" : 128,
                                                             "is_const" : true
                                                           },
                                                           "value_kind" : <"LValue">
@@ -4718,7 +4740,7 @@
                                                         {
                                                           "decl_ref" : {
                                                             "kind" : <"ImplicitParam">,
-                                                            "decl_pointer" : 156,
+                                                            "decl_pointer" : 158,
                                                             "name" : {
                                                               "name" : "self",
                                                               "qual_name" : [
@@ -4726,7 +4748,7 @@
                                                               ]
                                                             },
                                                             "qual_type" : {
-                                                              "type_ptr" : 126,
+                                                              "type_ptr" : 128,
                                                               "is_const" : true
                                                             }
                                                           }
@@ -4735,7 +4757,7 @@
                                                     ],
                                                     {
                                                       "qual_type" : {
-                                                        "type_ptr" : 126
+                                                        "type_ptr" : 128
                                                       }
                                                     },
                                                     {
@@ -4749,7 +4771,7 @@
                                             ],
                                             {
                                               "qual_type" : {
-                                                "type_ptr" : 205
+                                                "type_ptr" : 207
                                               },
                                               "value_kind" : <"LValue">,
                                               "object_kind" : <"ObjCProperty">
@@ -4757,7 +4779,7 @@
                                             {
                                               "kind" : <"PropertyRef" : {
                                                 "kind" : <"ObjCProperty">,
-                                                "decl_pointer" : 107,
+                                                "decl_pointer" : 109,
                                                 "name" : {
                                                   "name" : "str",
                                                   "qual_name" : [
@@ -4771,7 +4793,7 @@
                                           )>,
                                           <"OpaqueValueExpr" : (
                                             {
-                                              "pointer" : 206,
+                                              "pointer" : 208,
                                               "source_range" : (
                                                 {
                                                   "column" : 16
@@ -4792,7 +4814,7 @@
                                             {
                                               "source_expr" : <"DeclRefExpr" : (
                                                 {
-                                                  "pointer" : 207,
+                                                  "pointer" : 209,
                                                   "source_range" : (
                                                     {
                                                       "column" : 16
@@ -4813,7 +4835,7 @@
                                                 {
                                                   "decl_ref" : {
                                                     "kind" : <"ParmVar">,
-                                                    "decl_pointer" : 197,
+                                                    "decl_pointer" : 199,
                                                     "name" : {
                                                       "name" : "x",
                                                       "qual_name" : [
@@ -4841,7 +4863,7 @@
                                       )>,
                                       <"OpaqueValueExpr" : (
                                         {
-                                          "pointer" : 202,
+                                          "pointer" : 204,
                                           "source_range" : (
                                             {
                                               "column" : 5
@@ -4855,13 +4877,13 @@
                                         ],
                                         {
                                           "qual_type" : {
-                                            "type_ptr" : 126
+                                            "type_ptr" : 128
                                           }
                                         },
                                         {
                                           "source_expr" : <"ImplicitCastExpr" : (
                                             {
-                                              "pointer" : 203,
+                                              "pointer" : 205,
                                               "source_range" : (
                                                 {
                                                   "column" : 5
@@ -4874,7 +4896,7 @@
                                             [
                                               <"DeclRefExpr" : (
                                                 {
-                                                  "pointer" : 204,
+                                                  "pointer" : 206,
                                                   "source_range" : (
                                                     {
                                                       "column" : 5
@@ -4888,7 +4910,7 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 126,
+                                                    "type_ptr" : 128,
                                                     "is_const" : true
                                                   },
                                                   "value_kind" : <"LValue">
@@ -4896,7 +4918,7 @@
                                                 {
                                                   "decl_ref" : {
                                                     "kind" : <"ImplicitParam">,
-                                                    "decl_pointer" : 156,
+                                                    "decl_pointer" : 158,
                                                     "name" : {
                                                       "name" : "self",
                                                       "qual_name" : [
@@ -4904,7 +4926,7 @@
                                                       ]
                                                     },
                                                     "qual_type" : {
-                                                      "type_ptr" : 126,
+                                                      "type_ptr" : 128,
                                                       "is_const" : true
                                                     }
                                                   }
@@ -4913,7 +4935,7 @@
                                             ],
                                             {
                                               "qual_type" : {
-                                                "type_ptr" : 126
+                                                "type_ptr" : 128
                                               }
                                             },
                                             {
@@ -4926,7 +4948,7 @@
                                       )>,
                                       <"OpaqueValueExpr" : (
                                         {
-                                          "pointer" : 206,
+                                          "pointer" : 208,
                                           "source_range" : (
                                             {
                                               "column" : 16
@@ -4947,7 +4969,7 @@
                                         {
                                           "source_expr" : <"DeclRefExpr" : (
                                             {
-                                              "pointer" : 207,
+                                              "pointer" : 209,
                                               "source_range" : (
                                                 {
                                                   "column" : 16
@@ -4968,7 +4990,7 @@
                                             {
                                               "decl_ref" : {
                                                 "kind" : <"ParmVar">,
-                                                "decl_pointer" : 197,
+                                                "decl_pointer" : 199,
                                                 "name" : {
                                                   "name" : "x",
                                                   "qual_name" : [
@@ -4985,7 +5007,7 @@
                                       )>,
                                       <"OpaqueValueExpr" : (
                                         {
-                                          "pointer" : 208,
+                                          "pointer" : 210,
                                           "source_range" : (
                                             {
                                               "column" : 16
@@ -5005,7 +5027,7 @@
                                         {
                                           "source_expr" : <"ImplicitCastExpr" : (
                                             {
-                                              "pointer" : 209,
+                                              "pointer" : 211,
                                               "source_range" : (
                                                 {
                                                   "column" : 16
@@ -5018,7 +5040,7 @@
                                             [
                                               <"OpaqueValueExpr" : (
                                                 {
-                                                  "pointer" : 206,
+                                                  "pointer" : 208,
                                                   "source_range" : (
                                                     {
                                                       "column" : 16
@@ -5039,7 +5061,7 @@
                                                 {
                                                   "source_expr" : <"DeclRefExpr" : (
                                                     {
-                                                      "pointer" : 207,
+                                                      "pointer" : 209,
                                                       "source_range" : (
                                                         {
                                                           "column" : 16
@@ -5060,7 +5082,7 @@
                                                     {
                                                       "decl_ref" : {
                                                         "kind" : <"ParmVar">,
-                                                        "decl_pointer" : 197,
+                                                        "decl_pointer" : 199,
                                                         "name" : {
                                                           "name" : "x",
                                                           "qual_name" : [
@@ -5091,7 +5113,7 @@
                                       )>,
                                       <"ObjCMessageExpr" : (
                                         {
-                                          "pointer" : 210,
+                                          "pointer" : 212,
                                           "source_range" : (
                                             {
                                               "column" : 10
@@ -5104,7 +5126,7 @@
                                         [
                                           <"OpaqueValueExpr" : (
                                             {
-                                              "pointer" : 202,
+                                              "pointer" : 204,
                                               "source_range" : (
                                                 {
                                                   "column" : 5
@@ -5118,13 +5140,13 @@
                                             ],
                                             {
                                               "qual_type" : {
-                                                "type_ptr" : 126
+                                                "type_ptr" : 128
                                               }
                                             },
                                             {
                                               "source_expr" : <"ImplicitCastExpr" : (
                                                 {
-                                                  "pointer" : 203,
+                                                  "pointer" : 205,
                                                   "source_range" : (
                                                     {
                                                       "column" : 5
@@ -5137,7 +5159,7 @@
                                                 [
                                                   <"DeclRefExpr" : (
                                                     {
-                                                      "pointer" : 204,
+                                                      "pointer" : 206,
                                                       "source_range" : (
                                                         {
                                                           "column" : 5
@@ -5151,7 +5173,7 @@
                                                     ],
                                                     {
                                                       "qual_type" : {
-                                                        "type_ptr" : 126,
+                                                        "type_ptr" : 128,
                                                         "is_const" : true
                                                       },
                                                       "value_kind" : <"LValue">
@@ -5159,7 +5181,7 @@
                                                     {
                                                       "decl_ref" : {
                                                         "kind" : <"ImplicitParam">,
-                                                        "decl_pointer" : 156,
+                                                        "decl_pointer" : 158,
                                                         "name" : {
                                                           "name" : "self",
                                                           "qual_name" : [
@@ -5167,7 +5189,7 @@
                                                           ]
                                                         },
                                                         "qual_type" : {
-                                                          "type_ptr" : 126,
+                                                          "type_ptr" : 128,
                                                           "is_const" : true
                                                         }
                                                       }
@@ -5176,7 +5198,7 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 126
+                                                    "type_ptr" : 128
                                                   }
                                                 },
                                                 {
@@ -5189,7 +5211,7 @@
                                           )>,
                                           <"OpaqueValueExpr" : (
                                             {
-                                              "pointer" : 208,
+                                              "pointer" : 210,
                                               "source_range" : (
                                                 {
                                                   "column" : 16
@@ -5209,7 +5231,7 @@
                                             {
                                               "source_expr" : <"ImplicitCastExpr" : (
                                                 {
-                                                  "pointer" : 209,
+                                                  "pointer" : 211,
                                                   "source_range" : (
                                                     {
                                                       "column" : 16
@@ -5222,7 +5244,7 @@
                                                 [
                                                   <"OpaqueValueExpr" : (
                                                     {
-                                                      "pointer" : 206,
+                                                      "pointer" : 208,
                                                       "source_range" : (
                                                         {
                                                           "column" : 16
@@ -5243,7 +5265,7 @@
                                                     {
                                                       "source_expr" : <"DeclRefExpr" : (
                                                         {
-                                                          "pointer" : 207,
+                                                          "pointer" : 209,
                                                           "source_range" : (
                                                             {
                                                               "column" : 16
@@ -5264,7 +5286,7 @@
                                                         {
                                                           "decl_ref" : {
                                                             "kind" : <"ParmVar">,
-                                                            "decl_pointer" : 197,
+                                                            "decl_pointer" : 199,
                                                             "name" : {
                                                               "name" : "x",
                                                               "qual_name" : [
@@ -5296,13 +5318,13 @@
                                         ],
                                         {
                                           "qual_type" : {
-                                            "type_ptr" : 101
+                                            "type_ptr" : 103
                                           }
                                         },
                                         {
                                           "selector" : "setStr:",
                                           "is_definition_found" : true,
-                                          "decl_pointer" : 211
+                                          "decl_pointer" : 213
                                         }
                                       )>
                                     ],
@@ -5314,7 +5336,7 @@
                                   )>,
                                   <"ReturnStmt" : (
                                     {
-                                      "pointer" : 212,
+                                      "pointer" : 214,
                                       "source_range" : (
                                         {
                                           "line" : 44,
@@ -5328,7 +5350,7 @@
                                     [
                                       <"ObjCMessageExpr" : (
                                         {
-                                          "pointer" : 213,
+                                          "pointer" : 215,
                                           "source_range" : (
                                             {
                                               "column" : 12
@@ -5341,7 +5363,7 @@
                                         [
                                           <"ImplicitCastExpr" : (
                                             {
-                                              "pointer" : 214,
+                                              "pointer" : 216,
                                               "source_range" : (
                                                 {
                                                   "column" : 13
@@ -5354,7 +5376,7 @@
                                             [
                                               <"DeclRefExpr" : (
                                                 {
-                                                  "pointer" : 215,
+                                                  "pointer" : 217,
                                                   "source_range" : (
                                                     {
                                                       "column" : 13
@@ -5375,7 +5397,7 @@
                                                 {
                                                   "decl_ref" : {
                                                     "kind" : <"ParmVar">,
-                                                    "decl_pointer" : 197,
+                                                    "decl_pointer" : 199,
                                                     "name" : {
                                                       "name" : "x",
                                                       "qual_name" : [
@@ -5422,14 +5444,14 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 195
+                          "type_ptr" : 197
                         }
                       },
                       {
                         "decl_refs" : [
                           {
                             "kind" : <"Block">,
-                            "decl_pointer" : 196
+                            "decl_pointer" : 198
                           }
                         ]
                       }
@@ -5438,7 +5460,7 @@
                   [
                     <"VarDecl" : (
                       {
-                        "pointer" : 216,
+                        "pointer" : 218,
                         "source_range" : (
                           {
                             "line" : 42,
@@ -5457,12 +5479,12 @@
                         ]
                       },
                       {
-                        "type_ptr" : 217
+                        "type_ptr" : 219
                       },
                       {
                         "init_expr" : <"ExprWithCleanups" : (
                           {
-                            "pointer" : 193,
+                            "pointer" : 195,
                             "source_range" : (
                               {
                                 "line" : 42,
@@ -5477,7 +5499,7 @@
                           [
                             <"BlockExpr" : (
                               {
-                                "pointer" : 194,
+                                "pointer" : 196,
                                 "source_range" : (
                                   {
                                     "line" : 42,
@@ -5493,13 +5515,13 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 195
+                                  "type_ptr" : 197
                                 }
                               },
                               <"BlockDecl" : (
                                 {
-                                  "pointer" : 196,
-                                  "parent_pointer" : 154,
+                                  "pointer" : 198,
+                                  "parent_pointer" : 156,
                                   "source_range" : (
                                     {
                                       "line" : 42,
@@ -5515,7 +5537,7 @@
                                   "parameters" : [
                                     <"ParmVarDecl" : (
                                       {
-                                        "pointer" : 197,
+                                        "pointer" : 199,
                                         "source_range" : (
                                           {
                                             "line" : 42,
@@ -5546,7 +5568,7 @@
                                     {
                                       "variable" : {
                                         "kind" : <"ImplicitParam">,
-                                        "decl_pointer" : 156,
+                                        "decl_pointer" : 158,
                                         "name" : {
                                           "name" : "self",
                                           "qual_name" : [
@@ -5554,7 +5576,7 @@
                                           ]
                                         },
                                         "qual_type" : {
-                                          "type_ptr" : 126,
+                                          "type_ptr" : 128,
                                           "is_const" : true
                                         }
                                       }
@@ -5562,7 +5584,7 @@
                                   ],
                                   "body" : <"CompoundStmt" : (
                                     {
-                                      "pointer" : 198,
+                                      "pointer" : 200,
                                       "source_range" : (
                                         {
                                           "column" : 53
@@ -5576,7 +5598,7 @@
                                     [
                                       <"PseudoObjectExpr" : (
                                         {
-                                          "pointer" : 199,
+                                          "pointer" : 201,
                                           "source_range" : (
                                             {
                                               "line" : 43,
@@ -5590,7 +5612,7 @@
                                         [
                                           <"BinaryOperator" : (
                                             {
-                                              "pointer" : 200,
+                                              "pointer" : 202,
                                               "source_range" : (
                                                 {
                                                   "column" : 5
@@ -5603,7 +5625,7 @@
                                             [
                                               <"ObjCPropertyRefExpr" : (
                                                 {
-                                                  "pointer" : 201,
+                                                  "pointer" : 203,
                                                   "source_range" : (
                                                     {
                                                       "column" : 5
@@ -5616,7 +5638,7 @@
                                                 [
                                                   <"OpaqueValueExpr" : (
                                                     {
-                                                      "pointer" : 202,
+                                                      "pointer" : 204,
                                                       "source_range" : (
                                                         {
                                                           "column" : 5
@@ -5630,13 +5652,13 @@
                                                     ],
                                                     {
                                                       "qual_type" : {
-                                                        "type_ptr" : 126
+                                                        "type_ptr" : 128
                                                       }
                                                     },
                                                     {
                                                       "source_expr" : <"ImplicitCastExpr" : (
                                                         {
-                                                          "pointer" : 203,
+                                                          "pointer" : 205,
                                                           "source_range" : (
                                                             {
                                                               "column" : 5
@@ -5649,7 +5671,7 @@
                                                         [
                                                           <"DeclRefExpr" : (
                                                             {
-                                                              "pointer" : 204,
+                                                              "pointer" : 206,
                                                               "source_range" : (
                                                                 {
                                                                   "column" : 5
@@ -5663,7 +5685,7 @@
                                                             ],
                                                             {
                                                               "qual_type" : {
-                                                                "type_ptr" : 126,
+                                                                "type_ptr" : 128,
                                                                 "is_const" : true
                                                               },
                                                               "value_kind" : <"LValue">
@@ -5671,7 +5693,7 @@
                                                             {
                                                               "decl_ref" : {
                                                                 "kind" : <"ImplicitParam">,
-                                                                "decl_pointer" : 156,
+                                                                "decl_pointer" : 158,
                                                                 "name" : {
                                                                   "name" : "self",
                                                                   "qual_name" : [
@@ -5679,7 +5701,7 @@
                                                                   ]
                                                                 },
                                                                 "qual_type" : {
-                                                                  "type_ptr" : 126,
+                                                                  "type_ptr" : 128,
                                                                   "is_const" : true
                                                                 }
                                                               }
@@ -5688,7 +5710,7 @@
                                                         ],
                                                         {
                                                           "qual_type" : {
-                                                            "type_ptr" : 126
+                                                            "type_ptr" : 128
                                                           }
                                                         },
                                                         {
@@ -5702,7 +5724,7 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 205
+                                                    "type_ptr" : 207
                                                   },
                                                   "value_kind" : <"LValue">,
                                                   "object_kind" : <"ObjCProperty">
@@ -5710,7 +5732,7 @@
                                                 {
                                                   "kind" : <"PropertyRef" : {
                                                     "kind" : <"ObjCProperty">,
-                                                    "decl_pointer" : 107,
+                                                    "decl_pointer" : 109,
                                                     "name" : {
                                                       "name" : "str",
                                                       "qual_name" : [
@@ -5724,7 +5746,7 @@
                                               )>,
                                               <"OpaqueValueExpr" : (
                                                 {
-                                                  "pointer" : 206,
+                                                  "pointer" : 208,
                                                   "source_range" : (
                                                     {
                                                       "column" : 16
@@ -5745,7 +5767,7 @@
                                                 {
                                                   "source_expr" : <"DeclRefExpr" : (
                                                     {
-                                                      "pointer" : 207,
+                                                      "pointer" : 209,
                                                       "source_range" : (
                                                         {
                                                           "column" : 16
@@ -5766,7 +5788,7 @@
                                                     {
                                                       "decl_ref" : {
                                                         "kind" : <"ParmVar">,
-                                                        "decl_pointer" : 197,
+                                                        "decl_pointer" : 199,
                                                         "name" : {
                                                           "name" : "x",
                                                           "qual_name" : [
@@ -5794,7 +5816,7 @@
                                           )>,
                                           <"OpaqueValueExpr" : (
                                             {
-                                              "pointer" : 202,
+                                              "pointer" : 204,
                                               "source_range" : (
                                                 {
                                                   "column" : 5
@@ -5808,13 +5830,13 @@
                                             ],
                                             {
                                               "qual_type" : {
-                                                "type_ptr" : 126
+                                                "type_ptr" : 128
                                               }
                                             },
                                             {
                                               "source_expr" : <"ImplicitCastExpr" : (
                                                 {
-                                                  "pointer" : 203,
+                                                  "pointer" : 205,
                                                   "source_range" : (
                                                     {
                                                       "column" : 5
@@ -5827,7 +5849,7 @@
                                                 [
                                                   <"DeclRefExpr" : (
                                                     {
-                                                      "pointer" : 204,
+                                                      "pointer" : 206,
                                                       "source_range" : (
                                                         {
                                                           "column" : 5
@@ -5841,7 +5863,7 @@
                                                     ],
                                                     {
                                                       "qual_type" : {
-                                                        "type_ptr" : 126,
+                                                        "type_ptr" : 128,
                                                         "is_const" : true
                                                       },
                                                       "value_kind" : <"LValue">
@@ -5849,7 +5871,7 @@
                                                     {
                                                       "decl_ref" : {
                                                         "kind" : <"ImplicitParam">,
-                                                        "decl_pointer" : 156,
+                                                        "decl_pointer" : 158,
                                                         "name" : {
                                                           "name" : "self",
                                                           "qual_name" : [
@@ -5857,7 +5879,7 @@
                                                           ]
                                                         },
                                                         "qual_type" : {
-                                                          "type_ptr" : 126,
+                                                          "type_ptr" : 128,
                                                           "is_const" : true
                                                         }
                                                       }
@@ -5866,7 +5888,7 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 126
+                                                    "type_ptr" : 128
                                                   }
                                                 },
                                                 {
@@ -5879,7 +5901,7 @@
                                           )>,
                                           <"OpaqueValueExpr" : (
                                             {
-                                              "pointer" : 206,
+                                              "pointer" : 208,
                                               "source_range" : (
                                                 {
                                                   "column" : 16
@@ -5900,7 +5922,7 @@
                                             {
                                               "source_expr" : <"DeclRefExpr" : (
                                                 {
-                                                  "pointer" : 207,
+                                                  "pointer" : 209,
                                                   "source_range" : (
                                                     {
                                                       "column" : 16
@@ -5921,7 +5943,7 @@
                                                 {
                                                   "decl_ref" : {
                                                     "kind" : <"ParmVar">,
-                                                    "decl_pointer" : 197,
+                                                    "decl_pointer" : 199,
                                                     "name" : {
                                                       "name" : "x",
                                                       "qual_name" : [
@@ -5938,7 +5960,7 @@
                                           )>,
                                           <"OpaqueValueExpr" : (
                                             {
-                                              "pointer" : 208,
+                                              "pointer" : 210,
                                               "source_range" : (
                                                 {
                                                   "column" : 16
@@ -5958,7 +5980,7 @@
                                             {
                                               "source_expr" : <"ImplicitCastExpr" : (
                                                 {
-                                                  "pointer" : 209,
+                                                  "pointer" : 211,
                                                   "source_range" : (
                                                     {
                                                       "column" : 16
@@ -5971,7 +5993,7 @@
                                                 [
                                                   <"OpaqueValueExpr" : (
                                                     {
-                                                      "pointer" : 206,
+                                                      "pointer" : 208,
                                                       "source_range" : (
                                                         {
                                                           "column" : 16
@@ -5992,7 +6014,7 @@
                                                     {
                                                       "source_expr" : <"DeclRefExpr" : (
                                                         {
-                                                          "pointer" : 207,
+                                                          "pointer" : 209,
                                                           "source_range" : (
                                                             {
                                                               "column" : 16
@@ -6013,7 +6035,7 @@
                                                         {
                                                           "decl_ref" : {
                                                             "kind" : <"ParmVar">,
-                                                            "decl_pointer" : 197,
+                                                            "decl_pointer" : 199,
                                                             "name" : {
                                                               "name" : "x",
                                                               "qual_name" : [
@@ -6044,7 +6066,7 @@
                                           )>,
                                           <"ObjCMessageExpr" : (
                                             {
-                                              "pointer" : 210,
+                                              "pointer" : 212,
                                               "source_range" : (
                                                 {
                                                   "column" : 10
@@ -6057,7 +6079,7 @@
                                             [
                                               <"OpaqueValueExpr" : (
                                                 {
-                                                  "pointer" : 202,
+                                                  "pointer" : 204,
                                                   "source_range" : (
                                                     {
                                                       "column" : 5
@@ -6071,13 +6093,13 @@
                                                 ],
                                                 {
                                                   "qual_type" : {
-                                                    "type_ptr" : 126
+                                                    "type_ptr" : 128
                                                   }
                                                 },
                                                 {
                                                   "source_expr" : <"ImplicitCastExpr" : (
                                                     {
-                                                      "pointer" : 203,
+                                                      "pointer" : 205,
                                                       "source_range" : (
                                                         {
                                                           "column" : 5
@@ -6090,7 +6112,7 @@
                                                     [
                                                       <"DeclRefExpr" : (
                                                         {
-                                                          "pointer" : 204,
+                                                          "pointer" : 206,
                                                           "source_range" : (
                                                             {
                                                               "column" : 5
@@ -6104,7 +6126,7 @@
                                                         ],
                                                         {
                                                           "qual_type" : {
-                                                            "type_ptr" : 126,
+                                                            "type_ptr" : 128,
                                                             "is_const" : true
                                                           },
                                                           "value_kind" : <"LValue">
@@ -6112,7 +6134,7 @@
                                                         {
                                                           "decl_ref" : {
                                                             "kind" : <"ImplicitParam">,
-                                                            "decl_pointer" : 156,
+                                                            "decl_pointer" : 158,
                                                             "name" : {
                                                               "name" : "self",
                                                               "qual_name" : [
@@ -6120,7 +6142,7 @@
                                                               ]
                                                             },
                                                             "qual_type" : {
-                                                              "type_ptr" : 126,
+                                                              "type_ptr" : 128,
                                                               "is_const" : true
                                                             }
                                                           }
@@ -6129,7 +6151,7 @@
                                                     ],
                                                     {
                                                       "qual_type" : {
-                                                        "type_ptr" : 126
+                                                        "type_ptr" : 128
                                                       }
                                                     },
                                                     {
@@ -6142,7 +6164,7 @@
                                               )>,
                                               <"OpaqueValueExpr" : (
                                                 {
-                                                  "pointer" : 208,
+                                                  "pointer" : 210,
                                                   "source_range" : (
                                                     {
                                                       "column" : 16
@@ -6162,7 +6184,7 @@
                                                 {
                                                   "source_expr" : <"ImplicitCastExpr" : (
                                                     {
-                                                      "pointer" : 209,
+                                                      "pointer" : 211,
                                                       "source_range" : (
                                                         {
                                                           "column" : 16
@@ -6175,7 +6197,7 @@
                                                     [
                                                       <"OpaqueValueExpr" : (
                                                         {
-                                                          "pointer" : 206,
+                                                          "pointer" : 208,
                                                           "source_range" : (
                                                             {
                                                               "column" : 16
@@ -6196,7 +6218,7 @@
                                                         {
                                                           "source_expr" : <"DeclRefExpr" : (
                                                             {
-                                                              "pointer" : 207,
+                                                              "pointer" : 209,
                                                               "source_range" : (
                                                                 {
                                                                   "column" : 16
@@ -6217,7 +6239,7 @@
                                                             {
                                                               "decl_ref" : {
                                                                 "kind" : <"ParmVar">,
-                                                                "decl_pointer" : 197,
+                                                                "decl_pointer" : 199,
                                                                 "name" : {
                                                                   "name" : "x",
                                                                   "qual_name" : [
@@ -6249,13 +6271,13 @@
                                             ],
                                             {
                                               "qual_type" : {
-                                                "type_ptr" : 101
+                                                "type_ptr" : 103
                                               }
                                             },
                                             {
                                               "selector" : "setStr:",
                                               "is_definition_found" : true,
-                                              "decl_pointer" : 211
+                                              "decl_pointer" : 213
                                             }
                                           )>
                                         ],
@@ -6267,7 +6289,7 @@
                                       )>,
                                       <"ReturnStmt" : (
                                         {
-                                          "pointer" : 212,
+                                          "pointer" : 214,
                                           "source_range" : (
                                             {
                                               "line" : 44,
@@ -6281,7 +6303,7 @@
                                         [
                                           <"ObjCMessageExpr" : (
                                             {
-                                              "pointer" : 213,
+                                              "pointer" : 215,
                                               "source_range" : (
                                                 {
                                                   "column" : 12
@@ -6294,7 +6316,7 @@
                                             [
                                               <"ImplicitCastExpr" : (
                                                 {
-                                                  "pointer" : 214,
+                                                  "pointer" : 216,
                                                   "source_range" : (
                                                     {
                                                       "column" : 13
@@ -6307,7 +6329,7 @@
                                                 [
                                                   <"DeclRefExpr" : (
                                                     {
-                                                      "pointer" : 215,
+                                                      "pointer" : 217,
                                                       "source_range" : (
                                                         {
                                                           "column" : 13
@@ -6328,7 +6350,7 @@
                                                     {
                                                       "decl_ref" : {
                                                         "kind" : <"ParmVar">,
-                                                        "decl_pointer" : 197,
+                                                        "decl_pointer" : 199,
                                                         "name" : {
                                                           "name" : "x",
                                                           "qual_name" : [
@@ -6375,14 +6397,14 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 195
+                              "type_ptr" : 197
                             }
                           },
                           {
                             "decl_refs" : [
                               {
                                 "kind" : <"Block">,
-                                "decl_pointer" : 196
+                                "decl_pointer" : 198
                               }
                             ]
                           }
@@ -6393,7 +6415,7 @@
                 )>,
                 <"ObjCAtTryStmt" : (
                   {
-                    "pointer" : 218,
+                    "pointer" : 220,
                     "source_range" : (
                       {
                         "line" : 47,
@@ -6408,7 +6430,7 @@
                   [
                     <"CompoundStmt" : (
                       {
-                        "pointer" : 219,
+                        "pointer" : 221,
                         "source_range" : (
                           {
                             "line" : 47,
@@ -6423,7 +6445,7 @@
                       [
                         <"DeclStmt" : (
                           {
-                            "pointer" : 220,
+                            "pointer" : 222,
                             "source_range" : (
                               {
                                 "line" : 48,
@@ -6437,7 +6459,7 @@
                           [
                             <"ExprWithCleanups" : (
                               {
-                                "pointer" : 221,
+                                "pointer" : 223,
                                 "source_range" : (
                                   {
                                     "column" : 18
@@ -6450,7 +6472,7 @@
                               [
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 222,
+                                    "pointer" : 224,
                                     "source_range" : (
                                       {
                                         "column" : 18
@@ -6463,7 +6485,7 @@
                                   [
                                     <"ObjCArrayLiteral" : (
                                       {
-                                        "pointer" : 223,
+                                        "pointer" : 225,
                                         "source_range" : (
                                           {
                                             "column" : 18
@@ -6476,7 +6498,7 @@
                                       [
                                         <"ImplicitCastExpr" : (
                                           {
-                                            "pointer" : 224,
+                                            "pointer" : 226,
                                             "source_range" : (
                                               {
                                                 "column" : 21
@@ -6489,7 +6511,7 @@
                                           [
                                             <"ImplicitCastExpr" : (
                                               {
-                                                "pointer" : 225,
+                                                "pointer" : 227,
                                                 "source_range" : (
                                                   {
                                                     "column" : 21
@@ -6502,7 +6524,7 @@
                                               [
                                                 <"ObjCBoxedExpr" : (
                                                   {
-                                                    "pointer" : 226,
+                                                    "pointer" : 228,
                                                     "source_range" : (
                                                       {
                                                         "column" : 21
@@ -6515,7 +6537,7 @@
                                                   [
                                                     <"IntegerLiteral" : (
                                                       {
-                                                        "pointer" : 227,
+                                                        "pointer" : 229,
                                                         "source_range" : (
                                                           {
                                                             "column" : 22
@@ -6541,7 +6563,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 228
+                                                      "type_ptr" : 230
                                                     }
                                                   },
                                                   {
@@ -6551,7 +6573,7 @@
                                               ],
                                               {
                                                 "qual_type" : {
-                                                  "type_ptr" : 228
+                                                  "type_ptr" : 230
                                                 }
                                               },
                                               {
@@ -6607,7 +6629,7 @@
                           [
                             <"VarDecl" : (
                               {
-                                "pointer" : 229,
+                                "pointer" : 231,
                                 "source_range" : (
                                   {
                                     "column" : 5
@@ -6631,7 +6653,7 @@
                               {
                                 "init_expr" : <"ExprWithCleanups" : (
                                   {
-                                    "pointer" : 221,
+                                    "pointer" : 223,
                                     "source_range" : (
                                       {
                                         "column" : 18
@@ -6644,7 +6666,7 @@
                                   [
                                     <"ImplicitCastExpr" : (
                                       {
-                                        "pointer" : 222,
+                                        "pointer" : 224,
                                         "source_range" : (
                                           {
                                             "column" : 18
@@ -6657,7 +6679,7 @@
                                       [
                                         <"ObjCArrayLiteral" : (
                                           {
-                                            "pointer" : 223,
+                                            "pointer" : 225,
                                             "source_range" : (
                                               {
                                                 "column" : 18
@@ -6670,7 +6692,7 @@
                                           [
                                             <"ImplicitCastExpr" : (
                                               {
-                                                "pointer" : 224,
+                                                "pointer" : 226,
                                                 "source_range" : (
                                                   {
                                                     "column" : 21
@@ -6683,7 +6705,7 @@
                                               [
                                                 <"ImplicitCastExpr" : (
                                                   {
-                                                    "pointer" : 225,
+                                                    "pointer" : 227,
                                                     "source_range" : (
                                                       {
                                                         "column" : 21
@@ -6696,7 +6718,7 @@
                                                   [
                                                     <"ObjCBoxedExpr" : (
                                                       {
-                                                        "pointer" : 226,
+                                                        "pointer" : 228,
                                                         "source_range" : (
                                                           {
                                                             "column" : 21
@@ -6709,7 +6731,7 @@
                                                       [
                                                         <"IntegerLiteral" : (
                                                           {
-                                                            "pointer" : 227,
+                                                            "pointer" : 229,
                                                             "source_range" : (
                                                               {
                                                                 "column" : 22
@@ -6735,7 +6757,7 @@
                                                       ],
                                                       {
                                                         "qual_type" : {
-                                                          "type_ptr" : 228
+                                                          "type_ptr" : 230
                                                         }
                                                       },
                                                       {
@@ -6745,7 +6767,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 228
+                                                      "type_ptr" : 230
                                                     }
                                                   },
                                                   {
@@ -6803,7 +6825,7 @@
                         )>,
                         <"ExprWithCleanups" : (
                           {
-                            "pointer" : 230,
+                            "pointer" : 232,
                             "source_range" : (
                               {
                                 "line" : 49,
@@ -6817,7 +6839,7 @@
                           [
                             <"CallExpr" : (
                               {
-                                "pointer" : 231,
+                                "pointer" : 233,
                                 "source_range" : (
                                   {
                                     "column" : 5
@@ -6830,7 +6852,7 @@
                               [
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 232,
+                                    "pointer" : 234,
                                     "source_range" : (
                                       {
                                         "column" : 5
@@ -6843,7 +6865,7 @@
                                   [
                                     <"DeclRefExpr" : (
                                       {
-                                        "pointer" : 233,
+                                        "pointer" : 235,
                                         "source_range" : (
                                           {
                                             "column" : 5
@@ -6857,13 +6879,13 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 90
+                                          "type_ptr" : 91
                                         }
                                       },
                                       {
                                         "decl_ref" : {
                                           "kind" : <"Function">,
-                                          "decl_pointer" : 92,
+                                          "decl_pointer" : 93,
                                           "name" : {
                                             "name" : "NSLog",
                                             "qual_name" : [
@@ -6871,7 +6893,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 90
+                                            "type_ptr" : 91
                                           }
                                         }
                                       }
@@ -6879,7 +6901,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 162
+                                      "type_ptr" : 164
                                     }
                                   },
                                   {
@@ -6890,7 +6912,7 @@
                                 )>,
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 234,
+                                    "pointer" : 236,
                                     "source_range" : (
                                       {
                                         "column" : 11
@@ -6903,7 +6925,7 @@
                                   [
                                     <"ObjCStringLiteral" : (
                                       {
-                                        "pointer" : 235,
+                                        "pointer" : 237,
                                         "source_range" : (
                                           {
                                             "column" : 11
@@ -6916,7 +6938,7 @@
                                       [
                                         <"StringLiteral" : (
                                           {
-                                            "pointer" : 236,
+                                            "pointer" : 238,
                                             "source_range" : (
                                               {
                                                 "column" : 12
@@ -6930,7 +6952,7 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 166
+                                              "type_ptr" : 168
                                             },
                                             "value_kind" : <"LValue">
                                           },
@@ -6959,7 +6981,7 @@
                                 )>,
                                 <"PseudoObjectExpr" : (
                                   {
-                                    "pointer" : 237,
+                                    "pointer" : 239,
                                     "source_range" : (
                                       {
                                         "column" : 20
@@ -6972,7 +6994,7 @@
                                   [
                                     <"ObjCSubscriptRefExpr" : (
                                       {
-                                        "pointer" : 238,
+                                        "pointer" : 240,
                                         "source_range" : (
                                           {
                                             "column" : 20
@@ -6985,7 +7007,7 @@
                                       [
                                         <"OpaqueValueExpr" : (
                                           {
-                                            "pointer" : 239,
+                                            "pointer" : 241,
                                             "source_range" : (
                                               {
                                                 "column" : 20
@@ -7005,7 +7027,7 @@
                                           {
                                             "source_expr" : <"ImplicitCastExpr" : (
                                               {
-                                                "pointer" : 240,
+                                                "pointer" : 242,
                                                 "source_range" : (
                                                   {
                                                     "column" : 20
@@ -7018,7 +7040,7 @@
                                               [
                                                 <"DeclRefExpr" : (
                                                   {
-                                                    "pointer" : 241,
+                                                    "pointer" : 243,
                                                     "source_range" : (
                                                       {
                                                         "column" : 20
@@ -7039,7 +7061,7 @@
                                                   {
                                                     "decl_ref" : {
                                                       "kind" : <"Var">,
-                                                      "decl_pointer" : 229,
+                                                      "decl_pointer" : 231,
                                                       "name" : {
                                                         "name" : "a",
                                                         "qual_name" : [
@@ -7068,7 +7090,7 @@
                                         )>,
                                         <"OpaqueValueExpr" : (
                                           {
-                                            "pointer" : 242,
+                                            "pointer" : 244,
                                             "source_range" : (
                                               {
                                                 "column" : 22
@@ -7088,7 +7110,7 @@
                                           {
                                             "source_expr" : <"IntegerLiteral" : (
                                               {
-                                                "pointer" : 243,
+                                                "pointer" : 245,
                                                 "source_range" : (
                                                   {
                                                     "column" : 22
@@ -7116,7 +7138,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 205
+                                          "type_ptr" : 207
                                         },
                                         "value_kind" : <"LValue">,
                                         "object_kind" : <"ObjCSubscript">
@@ -7127,7 +7149,7 @@
                                     )>,
                                     <"OpaqueValueExpr" : (
                                       {
-                                        "pointer" : 239,
+                                        "pointer" : 241,
                                         "source_range" : (
                                           {
                                             "column" : 20
@@ -7147,7 +7169,7 @@
                                       {
                                         "source_expr" : <"ImplicitCastExpr" : (
                                           {
-                                            "pointer" : 240,
+                                            "pointer" : 242,
                                             "source_range" : (
                                               {
                                                 "column" : 20
@@ -7160,7 +7182,7 @@
                                           [
                                             <"DeclRefExpr" : (
                                               {
-                                                "pointer" : 241,
+                                                "pointer" : 243,
                                                 "source_range" : (
                                                   {
                                                     "column" : 20
@@ -7181,7 +7203,7 @@
                                               {
                                                 "decl_ref" : {
                                                   "kind" : <"Var">,
-                                                  "decl_pointer" : 229,
+                                                  "decl_pointer" : 231,
                                                   "name" : {
                                                     "name" : "a",
                                                     "qual_name" : [
@@ -7210,7 +7232,7 @@
                                     )>,
                                     <"OpaqueValueExpr" : (
                                       {
-                                        "pointer" : 242,
+                                        "pointer" : 244,
                                         "source_range" : (
                                           {
                                             "column" : 22
@@ -7230,7 +7252,7 @@
                                       {
                                         "source_expr" : <"IntegerLiteral" : (
                                           {
-                                            "pointer" : 243,
+                                            "pointer" : 245,
                                             "source_range" : (
                                               {
                                                 "column" : 22
@@ -7257,7 +7279,7 @@
                                     )>,
                                     <"ImplicitCastExpr" : (
                                       {
-                                        "pointer" : 244,
+                                        "pointer" : 246,
                                         "source_range" : (
                                           {
                                             "column" : 20
@@ -7270,7 +7292,7 @@
                                       [
                                         <"ObjCMessageExpr" : (
                                           {
-                                            "pointer" : 245,
+                                            "pointer" : 247,
                                             "source_range" : (
                                               {
                                                 "column" : 20
@@ -7283,7 +7305,7 @@
                                           [
                                             <"OpaqueValueExpr" : (
                                               {
-                                                "pointer" : 239,
+                                                "pointer" : 241,
                                                 "source_range" : (
                                                   {
                                                     "column" : 20
@@ -7303,7 +7325,7 @@
                                               {
                                                 "source_expr" : <"ImplicitCastExpr" : (
                                                   {
-                                                    "pointer" : 240,
+                                                    "pointer" : 242,
                                                     "source_range" : (
                                                       {
                                                         "column" : 20
@@ -7316,7 +7338,7 @@
                                                   [
                                                     <"DeclRefExpr" : (
                                                       {
-                                                        "pointer" : 241,
+                                                        "pointer" : 243,
                                                         "source_range" : (
                                                           {
                                                             "column" : 20
@@ -7337,7 +7359,7 @@
                                                       {
                                                         "decl_ref" : {
                                                           "kind" : <"Var">,
-                                                          "decl_pointer" : 229,
+                                                          "decl_pointer" : 231,
                                                           "name" : {
                                                             "name" : "a",
                                                             "qual_name" : [
@@ -7366,7 +7388,7 @@
                                             )>,
                                             <"ImplicitCastExpr" : (
                                               {
-                                                "pointer" : 246,
+                                                "pointer" : 248,
                                                 "source_range" : (
                                                   {
                                                     "column" : 22
@@ -7379,7 +7401,7 @@
                                               [
                                                 <"OpaqueValueExpr" : (
                                                   {
-                                                    "pointer" : 242,
+                                                    "pointer" : 244,
                                                     "source_range" : (
                                                       {
                                                         "column" : 22
@@ -7399,7 +7421,7 @@
                                                   {
                                                     "source_expr" : <"IntegerLiteral" : (
                                                       {
-                                                        "pointer" : 243,
+                                                        "pointer" : 245,
                                                         "source_range" : (
                                                           {
                                                             "column" : 22
@@ -7469,14 +7491,14 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 101
+                                  "type_ptr" : 103
                                 }
                               }
                             )>
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 101
+                              "type_ptr" : 103
                             }
                           },
                           {
@@ -7484,7 +7506,7 @@
                         )>,
                         <"DeclStmt" : (
                           {
-                            "pointer" : 247,
+                            "pointer" : 249,
                             "source_range" : (
                               {
                                 "line" : 51,
@@ -7498,7 +7520,7 @@
                           [
                             <"ExprWithCleanups" : (
                               {
-                                "pointer" : 248,
+                                "pointer" : 250,
                                 "source_range" : (
                                   {
                                     "column" : 23
@@ -7511,7 +7533,7 @@
                               [
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 249,
+                                    "pointer" : 251,
                                     "source_range" : (
                                       {
                                         "column" : 23
@@ -7524,7 +7546,7 @@
                                   [
                                     <"ObjCDictionaryLiteral" : (
                                       {
-                                        "pointer" : 250,
+                                        "pointer" : 252,
                                         "source_range" : (
                                           {
                                             "column" : 23
@@ -7537,7 +7559,7 @@
                                       [
                                         <"ImplicitCastExpr" : (
                                           {
-                                            "pointer" : 251,
+                                            "pointer" : 253,
                                             "source_range" : (
                                               {
                                                 "column" : 25
@@ -7550,7 +7572,7 @@
                                           [
                                             <"ObjCStringLiteral" : (
                                               {
-                                                "pointer" : 252,
+                                                "pointer" : 254,
                                                 "source_range" : (
                                                   {
                                                     "column" : 25
@@ -7563,7 +7585,7 @@
                                               [
                                                 <"StringLiteral" : (
                                                   {
-                                                    "pointer" : 253,
+                                                    "pointer" : 255,
                                                     "source_range" : (
                                                       {
                                                         "column" : 26
@@ -7577,7 +7599,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 166
+                                                      "type_ptr" : 168
                                                     },
                                                     "value_kind" : <"LValue">
                                                   },
@@ -7606,7 +7628,7 @@
                                         )>,
                                         <"ImplicitCastExpr" : (
                                           {
-                                            "pointer" : 254,
+                                            "pointer" : 256,
                                             "source_range" : (
                                               {
                                                 "column" : 34
@@ -7619,7 +7641,7 @@
                                           [
                                             <"ImplicitCastExpr" : (
                                               {
-                                                "pointer" : 255,
+                                                "pointer" : 257,
                                                 "source_range" : (
                                                   {
                                                     "column" : 34
@@ -7632,7 +7654,7 @@
                                               [
                                                 <"ObjCBoxedExpr" : (
                                                   {
-                                                    "pointer" : 256,
+                                                    "pointer" : 258,
                                                     "source_range" : (
                                                       {
                                                         "column" : 34
@@ -7645,7 +7667,7 @@
                                                   [
                                                     <"IntegerLiteral" : (
                                                       {
-                                                        "pointer" : 257,
+                                                        "pointer" : 259,
                                                         "source_range" : (
                                                           {
                                                             "column" : 35
@@ -7671,7 +7693,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 228
+                                                      "type_ptr" : 230
                                                     }
                                                   },
                                                   {
@@ -7681,7 +7703,7 @@
                                               ],
                                               {
                                                 "qual_type" : {
-                                                  "type_ptr" : 228
+                                                  "type_ptr" : 230
                                                 }
                                               },
                                               {
@@ -7737,7 +7759,7 @@
                           [
                             <"VarDecl" : (
                               {
-                                "pointer" : 258,
+                                "pointer" : 260,
                                 "source_range" : (
                                   {
                                     "column" : 5
@@ -7761,7 +7783,7 @@
                               {
                                 "init_expr" : <"ExprWithCleanups" : (
                                   {
-                                    "pointer" : 248,
+                                    "pointer" : 250,
                                     "source_range" : (
                                       {
                                         "column" : 23
@@ -7774,7 +7796,7 @@
                                   [
                                     <"ImplicitCastExpr" : (
                                       {
-                                        "pointer" : 249,
+                                        "pointer" : 251,
                                         "source_range" : (
                                           {
                                             "column" : 23
@@ -7787,7 +7809,7 @@
                                       [
                                         <"ObjCDictionaryLiteral" : (
                                           {
-                                            "pointer" : 250,
+                                            "pointer" : 252,
                                             "source_range" : (
                                               {
                                                 "column" : 23
@@ -7800,7 +7822,7 @@
                                           [
                                             <"ImplicitCastExpr" : (
                                               {
-                                                "pointer" : 251,
+                                                "pointer" : 253,
                                                 "source_range" : (
                                                   {
                                                     "column" : 25
@@ -7813,7 +7835,7 @@
                                               [
                                                 <"ObjCStringLiteral" : (
                                                   {
-                                                    "pointer" : 252,
+                                                    "pointer" : 254,
                                                     "source_range" : (
                                                       {
                                                         "column" : 25
@@ -7826,7 +7848,7 @@
                                                   [
                                                     <"StringLiteral" : (
                                                       {
-                                                        "pointer" : 253,
+                                                        "pointer" : 255,
                                                         "source_range" : (
                                                           {
                                                             "column" : 26
@@ -7840,7 +7862,7 @@
                                                       ],
                                                       {
                                                         "qual_type" : {
-                                                          "type_ptr" : 166
+                                                          "type_ptr" : 168
                                                         },
                                                         "value_kind" : <"LValue">
                                                       },
@@ -7869,7 +7891,7 @@
                                             )>,
                                             <"ImplicitCastExpr" : (
                                               {
-                                                "pointer" : 254,
+                                                "pointer" : 256,
                                                 "source_range" : (
                                                   {
                                                     "column" : 34
@@ -7882,7 +7904,7 @@
                                               [
                                                 <"ImplicitCastExpr" : (
                                                   {
-                                                    "pointer" : 255,
+                                                    "pointer" : 257,
                                                     "source_range" : (
                                                       {
                                                         "column" : 34
@@ -7895,7 +7917,7 @@
                                                   [
                                                     <"ObjCBoxedExpr" : (
                                                       {
-                                                        "pointer" : 256,
+                                                        "pointer" : 258,
                                                         "source_range" : (
                                                           {
                                                             "column" : 34
@@ -7908,7 +7930,7 @@
                                                       [
                                                         <"IntegerLiteral" : (
                                                           {
-                                                            "pointer" : 257,
+                                                            "pointer" : 259,
                                                             "source_range" : (
                                                               {
                                                                 "column" : 35
@@ -7934,7 +7956,7 @@
                                                       ],
                                                       {
                                                         "qual_type" : {
-                                                          "type_ptr" : 228
+                                                          "type_ptr" : 230
                                                         }
                                                       },
                                                       {
@@ -7944,7 +7966,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 228
+                                                      "type_ptr" : 230
                                                     }
                                                   },
                                                   {
@@ -8002,7 +8024,7 @@
                         )>,
                         <"ExprWithCleanups" : (
                           {
-                            "pointer" : 259,
+                            "pointer" : 261,
                             "source_range" : (
                               {
                                 "line" : 52,
@@ -8016,7 +8038,7 @@
                           [
                             <"CallExpr" : (
                               {
-                                "pointer" : 260,
+                                "pointer" : 262,
                                 "source_range" : (
                                   {
                                     "column" : 5
@@ -8029,7 +8051,7 @@
                               [
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 261,
+                                    "pointer" : 263,
                                     "source_range" : (
                                       {
                                         "column" : 5
@@ -8042,7 +8064,7 @@
                                   [
                                     <"DeclRefExpr" : (
                                       {
-                                        "pointer" : 262,
+                                        "pointer" : 264,
                                         "source_range" : (
                                           {
                                             "column" : 5
@@ -8056,13 +8078,13 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 90
+                                          "type_ptr" : 91
                                         }
                                       },
                                       {
                                         "decl_ref" : {
                                           "kind" : <"Function">,
-                                          "decl_pointer" : 92,
+                                          "decl_pointer" : 93,
                                           "name" : {
                                             "name" : "NSLog",
                                             "qual_name" : [
@@ -8070,7 +8092,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 90
+                                            "type_ptr" : 91
                                           }
                                         }
                                       }
@@ -8078,7 +8100,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 162
+                                      "type_ptr" : 164
                                     }
                                   },
                                   {
@@ -8089,7 +8111,7 @@
                                 )>,
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 263,
+                                    "pointer" : 265,
                                     "source_range" : (
                                       {
                                         "column" : 11
@@ -8102,7 +8124,7 @@
                                   [
                                     <"ObjCStringLiteral" : (
                                       {
-                                        "pointer" : 264,
+                                        "pointer" : 266,
                                         "source_range" : (
                                           {
                                             "column" : 11
@@ -8115,7 +8137,7 @@
                                       [
                                         <"StringLiteral" : (
                                           {
-                                            "pointer" : 265,
+                                            "pointer" : 267,
                                             "source_range" : (
                                               {
                                                 "column" : 12
@@ -8129,7 +8151,7 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 166
+                                              "type_ptr" : 168
                                             },
                                             "value_kind" : <"LValue">
                                           },
@@ -8158,7 +8180,7 @@
                                 )>,
                                 <"PseudoObjectExpr" : (
                                   {
-                                    "pointer" : 266,
+                                    "pointer" : 268,
                                     "source_range" : (
                                       {
                                         "column" : 20
@@ -8171,7 +8193,7 @@
                                   [
                                     <"ObjCSubscriptRefExpr" : (
                                       {
-                                        "pointer" : 267,
+                                        "pointer" : 269,
                                         "source_range" : (
                                           {
                                             "column" : 20
@@ -8184,7 +8206,7 @@
                                       [
                                         <"OpaqueValueExpr" : (
                                           {
-                                            "pointer" : 268,
+                                            "pointer" : 270,
                                             "source_range" : (
                                               {
                                                 "column" : 20
@@ -8204,7 +8226,7 @@
                                           {
                                             "source_expr" : <"ImplicitCastExpr" : (
                                               {
-                                                "pointer" : 269,
+                                                "pointer" : 271,
                                                 "source_range" : (
                                                   {
                                                     "column" : 20
@@ -8217,7 +8239,7 @@
                                               [
                                                 <"DeclRefExpr" : (
                                                   {
-                                                    "pointer" : 270,
+                                                    "pointer" : 272,
                                                     "source_range" : (
                                                       {
                                                         "column" : 20
@@ -8238,7 +8260,7 @@
                                                   {
                                                     "decl_ref" : {
                                                       "kind" : <"Var">,
-                                                      "decl_pointer" : 258,
+                                                      "decl_pointer" : 260,
                                                       "name" : {
                                                         "name" : "d",
                                                         "qual_name" : [
@@ -8267,7 +8289,7 @@
                                         )>,
                                         <"OpaqueValueExpr" : (
                                           {
-                                            "pointer" : 271,
+                                            "pointer" : 273,
                                             "source_range" : (
                                               {
                                                 "column" : 22
@@ -8287,7 +8309,7 @@
                                           {
                                             "source_expr" : <"ObjCStringLiteral" : (
                                               {
-                                                "pointer" : 272,
+                                                "pointer" : 274,
                                                 "source_range" : (
                                                   {
                                                     "column" : 22
@@ -8300,7 +8322,7 @@
                                               [
                                                 <"StringLiteral" : (
                                                   {
-                                                    "pointer" : 273,
+                                                    "pointer" : 275,
                                                     "source_range" : (
                                                       {
                                                         "column" : 23
@@ -8314,7 +8336,7 @@
                                                   ],
                                                   {
                                                     "qual_type" : {
-                                                      "type_ptr" : 274
+                                                      "type_ptr" : 276
                                                     },
                                                     "value_kind" : <"LValue">
                                                   },
@@ -8334,7 +8356,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 205
+                                          "type_ptr" : 207
                                         },
                                         "value_kind" : <"LValue">,
                                         "object_kind" : <"ObjCSubscript">
@@ -8345,7 +8367,7 @@
                                     )>,
                                     <"OpaqueValueExpr" : (
                                       {
-                                        "pointer" : 268,
+                                        "pointer" : 270,
                                         "source_range" : (
                                           {
                                             "column" : 20
@@ -8365,7 +8387,7 @@
                                       {
                                         "source_expr" : <"ImplicitCastExpr" : (
                                           {
-                                            "pointer" : 269,
+                                            "pointer" : 271,
                                             "source_range" : (
                                               {
                                                 "column" : 20
@@ -8378,7 +8400,7 @@
                                           [
                                             <"DeclRefExpr" : (
                                               {
-                                                "pointer" : 270,
+                                                "pointer" : 272,
                                                 "source_range" : (
                                                   {
                                                     "column" : 20
@@ -8399,7 +8421,7 @@
                                               {
                                                 "decl_ref" : {
                                                   "kind" : <"Var">,
-                                                  "decl_pointer" : 258,
+                                                  "decl_pointer" : 260,
                                                   "name" : {
                                                     "name" : "d",
                                                     "qual_name" : [
@@ -8428,7 +8450,7 @@
                                     )>,
                                     <"OpaqueValueExpr" : (
                                       {
-                                        "pointer" : 271,
+                                        "pointer" : 273,
                                         "source_range" : (
                                           {
                                             "column" : 22
@@ -8448,7 +8470,7 @@
                                       {
                                         "source_expr" : <"ObjCStringLiteral" : (
                                           {
-                                            "pointer" : 272,
+                                            "pointer" : 274,
                                             "source_range" : (
                                               {
                                                 "column" : 22
@@ -8461,7 +8483,7 @@
                                           [
                                             <"StringLiteral" : (
                                               {
-                                                "pointer" : 273,
+                                                "pointer" : 275,
                                                 "source_range" : (
                                                   {
                                                     "column" : 23
@@ -8475,7 +8497,7 @@
                                               ],
                                               {
                                                 "qual_type" : {
-                                                  "type_ptr" : 274
+                                                  "type_ptr" : 276
                                                 },
                                                 "value_kind" : <"LValue">
                                               },
@@ -8494,7 +8516,7 @@
                                     )>,
                                     <"ImplicitCastExpr" : (
                                       {
-                                        "pointer" : 275,
+                                        "pointer" : 277,
                                         "source_range" : (
                                           {
                                             "column" : 20
@@ -8507,7 +8529,7 @@
                                       [
                                         <"ObjCMessageExpr" : (
                                           {
-                                            "pointer" : 276,
+                                            "pointer" : 278,
                                             "source_range" : (
                                               {
                                                 "column" : 20
@@ -8520,7 +8542,7 @@
                                           [
                                             <"OpaqueValueExpr" : (
                                               {
-                                                "pointer" : 268,
+                                                "pointer" : 270,
                                                 "source_range" : (
                                                   {
                                                     "column" : 20
@@ -8540,7 +8562,7 @@
                                               {
                                                 "source_expr" : <"ImplicitCastExpr" : (
                                                   {
-                                                    "pointer" : 269,
+                                                    "pointer" : 271,
                                                     "source_range" : (
                                                       {
                                                         "column" : 20
@@ -8553,7 +8575,7 @@
                                                   [
                                                     <"DeclRefExpr" : (
                                                       {
-                                                        "pointer" : 270,
+                                                        "pointer" : 272,
                                                         "source_range" : (
                                                           {
                                                             "column" : 20
@@ -8574,7 +8596,7 @@
                                                       {
                                                         "decl_ref" : {
                                                           "kind" : <"Var">,
-                                                          "decl_pointer" : 258,
+                                                          "decl_pointer" : 260,
                                                           "name" : {
                                                             "name" : "d",
                                                             "qual_name" : [
@@ -8603,7 +8625,7 @@
                                             )>,
                                             <"ImplicitCastExpr" : (
                                               {
-                                                "pointer" : 277,
+                                                "pointer" : 279,
                                                 "source_range" : (
                                                   {
                                                     "column" : 22
@@ -8616,7 +8638,7 @@
                                               [
                                                 <"OpaqueValueExpr" : (
                                                   {
-                                                    "pointer" : 271,
+                                                    "pointer" : 273,
                                                     "source_range" : (
                                                       {
                                                         "column" : 22
@@ -8636,7 +8658,7 @@
                                                   {
                                                     "source_expr" : <"ObjCStringLiteral" : (
                                                       {
-                                                        "pointer" : 272,
+                                                        "pointer" : 274,
                                                         "source_range" : (
                                                           {
                                                             "column" : 22
@@ -8649,7 +8671,7 @@
                                                       [
                                                         <"StringLiteral" : (
                                                           {
-                                                            "pointer" : 273,
+                                                            "pointer" : 275,
                                                             "source_range" : (
                                                               {
                                                                 "column" : 23
@@ -8663,7 +8685,7 @@
                                                           ],
                                                           {
                                                             "qual_type" : {
-                                                              "type_ptr" : 274
+                                                              "type_ptr" : 276
                                                             },
                                                             "value_kind" : <"LValue">
                                                           },
@@ -8725,14 +8747,14 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 101
+                                  "type_ptr" : 103
                                 }
                               }
                             )>
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 101
+                              "type_ptr" : 103
                             }
                           },
                           {
@@ -8742,7 +8764,7 @@
                     )>,
                     <"ObjCAtCatchStmt" : (
                       {
-                        "pointer" : 278,
+                        "pointer" : 280,
                         "source_range" : (
                           {
                             "line" : 53,
@@ -8757,7 +8779,7 @@
                       [
                         <"CompoundStmt" : (
                           {
-                            "pointer" : 279,
+                            "pointer" : 281,
                             "source_range" : (
                               {
                                 "line" : 53,
@@ -8772,7 +8794,7 @@
                           [
                             <"CallExpr" : (
                               {
-                                "pointer" : 280,
+                                "pointer" : 282,
                                 "source_range" : (
                                   {
                                     "line" : 54,
@@ -8786,7 +8808,7 @@
                               [
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 281,
+                                    "pointer" : 283,
                                     "source_range" : (
                                       {
                                         "column" : 5
@@ -8799,7 +8821,7 @@
                                   [
                                     <"DeclRefExpr" : (
                                       {
-                                        "pointer" : 282,
+                                        "pointer" : 284,
                                         "source_range" : (
                                           {
                                             "column" : 5
@@ -8813,13 +8835,13 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 90
+                                          "type_ptr" : 91
                                         }
                                       },
                                       {
                                         "decl_ref" : {
                                           "kind" : <"Function">,
-                                          "decl_pointer" : 92,
+                                          "decl_pointer" : 93,
                                           "name" : {
                                             "name" : "NSLog",
                                             "qual_name" : [
@@ -8827,7 +8849,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 90
+                                            "type_ptr" : 91
                                           }
                                         }
                                       }
@@ -8835,7 +8857,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 162
+                                      "type_ptr" : 164
                                     }
                                   },
                                   {
@@ -8846,7 +8868,7 @@
                                 )>,
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 283,
+                                    "pointer" : 285,
                                     "source_range" : (
                                       {
                                         "column" : 11
@@ -8859,7 +8881,7 @@
                                   [
                                     <"ObjCStringLiteral" : (
                                       {
-                                        "pointer" : 284,
+                                        "pointer" : 286,
                                         "source_range" : (
                                           {
                                             "column" : 11
@@ -8872,7 +8894,7 @@
                                       [
                                         <"StringLiteral" : (
                                           {
-                                            "pointer" : 285,
+                                            "pointer" : 287,
                                             "source_range" : (
                                               {
                                                 "column" : 12
@@ -8886,7 +8908,7 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 286
+                                              "type_ptr" : 288
                                             },
                                             "value_kind" : <"LValue">
                                           },
@@ -8915,7 +8937,7 @@
                                 )>,
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 287,
+                                    "pointer" : 289,
                                     "source_range" : (
                                       {
                                         "column" : 29
@@ -8928,7 +8950,7 @@
                                   [
                                     <"DeclRefExpr" : (
                                       {
-                                        "pointer" : 288,
+                                        "pointer" : 290,
                                         "source_range" : (
                                           {
                                             "column" : 29
@@ -8942,14 +8964,14 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 289
+                                          "type_ptr" : 291
                                         },
                                         "value_kind" : <"LValue">
                                       },
                                       {
                                         "decl_ref" : {
                                           "kind" : <"Var">,
-                                          "decl_pointer" : 290,
+                                          "decl_pointer" : 292,
                                           "name" : {
                                             "name" : "e",
                                             "qual_name" : [
@@ -8957,7 +8979,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 289
+                                            "type_ptr" : 291
                                           }
                                         }
                                       }
@@ -8965,7 +8987,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 289
+                                      "type_ptr" : 291
                                     }
                                   },
                                   {
@@ -8977,7 +8999,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 101
+                                  "type_ptr" : 103
                                 }
                               }
                             )>
@@ -8986,7 +9008,7 @@
                       ],
                       <"CatchParam" : <"VarDecl" : (
                         {
-                          "pointer" : 290,
+                          "pointer" : 292,
                           "source_range" : (
                             {
                               "line" : 53,
@@ -9006,7 +9028,7 @@
                           ]
                         },
                         {
-                          "type_ptr" : 289
+                          "type_ptr" : 291
                         },
                         {
                         }
@@ -9014,7 +9036,7 @@
                     )>,
                     <"ObjCAtFinallyStmt" : (
                       {
-                        "pointer" : 291,
+                        "pointer" : 293,
                         "source_range" : (
                           {
                             "line" : 55,
@@ -9029,7 +9051,7 @@
                       [
                         <"CompoundStmt" : (
                           {
-                            "pointer" : 292,
+                            "pointer" : 294,
                             "source_range" : (
                               {
                                 "line" : 55,
@@ -9044,7 +9066,7 @@
                           [
                             <"CallExpr" : (
                               {
-                                "pointer" : 293,
+                                "pointer" : 295,
                                 "source_range" : (
                                   {
                                     "line" : 56,
@@ -9058,7 +9080,7 @@
                               [
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 294,
+                                    "pointer" : 296,
                                     "source_range" : (
                                       {
                                         "column" : 5
@@ -9071,7 +9093,7 @@
                                   [
                                     <"DeclRefExpr" : (
                                       {
-                                        "pointer" : 295,
+                                        "pointer" : 297,
                                         "source_range" : (
                                           {
                                             "column" : 5
@@ -9085,13 +9107,13 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 90
+                                          "type_ptr" : 91
                                         }
                                       },
                                       {
                                         "decl_ref" : {
                                           "kind" : <"Function">,
-                                          "decl_pointer" : 92,
+                                          "decl_pointer" : 93,
                                           "name" : {
                                             "name" : "NSLog",
                                             "qual_name" : [
@@ -9099,7 +9121,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 90
+                                            "type_ptr" : 91
                                           }
                                         }
                                       }
@@ -9107,7 +9129,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 162
+                                      "type_ptr" : 164
                                     }
                                   },
                                   {
@@ -9118,7 +9140,7 @@
                                 )>,
                                 <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 296,
+                                    "pointer" : 298,
                                     "source_range" : (
                                       {
                                         "column" : 11
@@ -9131,7 +9153,7 @@
                                   [
                                     <"ObjCStringLiteral" : (
                                       {
-                                        "pointer" : 297,
+                                        "pointer" : 299,
                                         "source_range" : (
                                           {
                                             "column" : 11
@@ -9144,7 +9166,7 @@
                                       [
                                         <"StringLiteral" : (
                                           {
-                                            "pointer" : 298,
+                                            "pointer" : 300,
                                             "source_range" : (
                                               {
                                                 "column" : 12
@@ -9158,7 +9180,7 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 299
+                                              "type_ptr" : 301
                                             },
                                             "value_kind" : <"LValue">
                                           },
@@ -9188,7 +9210,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 101
+                                  "type_ptr" : 103
                                 }
                               }
                             )>
@@ -9200,7 +9222,7 @@
                 )>,
                 <"GotoStmt" : (
                   {
-                    "pointer" : 300,
+                    "pointer" : 302,
                     "source_range" : (
                       {
                         "line" : 59,
@@ -9215,12 +9237,12 @@
                   ],
                   {
                     "label" : "theend",
-                    "pointer" : 301
+                    "pointer" : 303
                   }
                 )>,
                 <"ReturnStmt" : (
                   {
-                    "pointer" : 302,
+                    "pointer" : 304,
                     "source_range" : (
                       {
                         "line" : 60,
@@ -9236,7 +9258,7 @@
                 )>,
                 <"LabelStmt" : (
                   {
-                    "pointer" : 303,
+                    "pointer" : 305,
                     "source_range" : (
                       {
                         "line" : 61,
@@ -9251,7 +9273,7 @@
                   [
                     <"CallExpr" : (
                       {
-                        "pointer" : 304,
+                        "pointer" : 306,
                         "source_range" : (
                           {
                             "column" : 3
@@ -9264,7 +9286,7 @@
                       [
                         <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 305,
+                            "pointer" : 307,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -9277,7 +9299,7 @@
                           [
                             <"DeclRefExpr" : (
                               {
-                                "pointer" : 306,
+                                "pointer" : 308,
                                 "source_range" : (
                                   {
                                     "column" : 3
@@ -9291,13 +9313,13 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 90
+                                  "type_ptr" : 91
                                 }
                               },
                               {
                                 "decl_ref" : {
                                   "kind" : <"Function">,
-                                  "decl_pointer" : 92,
+                                  "decl_pointer" : 93,
                                   "name" : {
                                     "name" : "NSLog",
                                     "qual_name" : [
@@ -9305,7 +9327,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 90
+                                    "type_ptr" : 91
                                   }
                                 }
                               }
@@ -9313,7 +9335,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 162
+                              "type_ptr" : 164
                             }
                           },
                           {
@@ -9324,7 +9346,7 @@
                         )>,
                         <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 307,
+                            "pointer" : 309,
                             "source_range" : (
                               {
                                 "column" : 9
@@ -9337,7 +9359,7 @@
                           [
                             <"ObjCStringLiteral" : (
                               {
-                                "pointer" : 308,
+                                "pointer" : 310,
                                 "source_range" : (
                                   {
                                     "column" : 9
@@ -9350,7 +9372,7 @@
                               [
                                 <"StringLiteral" : (
                                   {
-                                    "pointer" : 309,
+                                    "pointer" : 311,
                                     "source_range" : (
                                       {
                                         "column" : 10
@@ -9364,7 +9386,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 310
+                                      "type_ptr" : 312
                                     },
                                     "value_kind" : <"LValue">
                                   },
@@ -9394,7 +9416,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       }
                     )>
@@ -9408,8 +9430,8 @@
         )>,
         <"ObjCIvarDecl" : (
           {
-            "pointer" : 110,
-            "parent_pointer" : 146,
+            "pointer" : 112,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "line" : 18,
@@ -9439,7 +9461,7 @@
         )>,
         <"ObjCPropertyImplDecl" : (
           {
-            "pointer" : 311,
+            "pointer" : 313,
             "source_range" : (
               {
               },
@@ -9452,7 +9474,7 @@
             "implementation" : <"Synthesize">,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 107,
+              "decl_pointer" : 109,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -9463,7 +9485,7 @@
             },
             "ivar_decl" : {
               "kind" : <"ObjCIvar">,
-              "decl_pointer" : 110,
+              "decl_pointer" : 112,
               "name" : {
                 "name" : "_str",
                 "qual_name" : [
@@ -9479,8 +9501,8 @@
         )>,
         <"ObjCIvarDecl" : (
           {
-            "pointer" : 115,
-            "parent_pointer" : 146,
+            "pointer" : 117,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "line" : 20,
@@ -9499,7 +9521,7 @@
             ]
           },
           {
-            "type_ptr" : 112
+            "type_ptr" : 114
           },
           {
           },
@@ -9510,7 +9532,7 @@
         )>,
         <"ObjCPropertyImplDecl" : (
           {
-            "pointer" : 312,
+            "pointer" : 314,
             "source_range" : (
               {
               },
@@ -9523,7 +9545,7 @@
             "implementation" : <"Synthesize">,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 111,
+              "decl_pointer" : 113,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -9534,7 +9556,7 @@
             },
             "ivar_decl" : {
               "kind" : <"ObjCIvar">,
-              "decl_pointer" : 115,
+              "decl_pointer" : 117,
               "name" : {
                 "name" : "_x",
                 "qual_name" : [
@@ -9543,15 +9565,15 @@
                 ]
               },
               "qual_type" : {
-                "type_ptr" : 112
+                "type_ptr" : 114
               }
             }
           }
         )>,
         <"ObjCIvarDecl" : (
           {
-            "pointer" : 119,
-            "parent_pointer" : 146,
+            "pointer" : 121,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "line" : 21,
@@ -9581,7 +9603,7 @@
         )>,
         <"ObjCPropertyImplDecl" : (
           {
-            "pointer" : 313,
+            "pointer" : 315,
             "source_range" : (
               {
               },
@@ -9594,7 +9616,7 @@
             "implementation" : <"Synthesize">,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 116,
+              "decl_pointer" : 118,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -9605,7 +9627,7 @@
             },
             "ivar_decl" : {
               "kind" : <"ObjCIvar">,
-              "decl_pointer" : 119,
+              "decl_pointer" : 121,
               "name" : {
                 "name" : "_y",
                 "qual_name" : [
@@ -9621,8 +9643,8 @@
         )>,
         <"ObjCIvarDecl" : (
           {
-            "pointer" : 124,
-            "parent_pointer" : 146,
+            "pointer" : 126,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "line" : 22,
@@ -9641,7 +9663,7 @@
             ]
           },
           {
-            "type_ptr" : 121
+            "type_ptr" : 123
           },
           {
           },
@@ -9652,7 +9674,7 @@
         )>,
         <"ObjCPropertyImplDecl" : (
           {
-            "pointer" : 314,
+            "pointer" : 316,
             "source_range" : (
               {
               },
@@ -9665,7 +9687,7 @@
             "implementation" : <"Synthesize">,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 120,
+              "decl_pointer" : 122,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -9676,7 +9698,7 @@
             },
             "ivar_decl" : {
               "kind" : <"ObjCIvar">,
-              "decl_pointer" : 124,
+              "decl_pointer" : 126,
               "name" : {
                 "name" : "_delegate",
                 "qual_name" : [
@@ -9685,15 +9707,15 @@
                 ]
               },
               "qual_type" : {
-                "type_ptr" : 121
+                "type_ptr" : 123
               }
             }
           }
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 315,
-            "parent_pointer" : 146,
+            "pointer" : 317,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "line" : 18,
@@ -9720,7 +9742,7 @@
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 107,
+              "decl_pointer" : 109,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -9732,7 +9754,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 125,
+                  "pointer" : 127,
                   "source_range" : (
                     {
                     },
@@ -9748,7 +9770,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -9756,7 +9778,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 127,
+                  "pointer" : 129,
                   "source_range" : (
                     {
                     },
@@ -9783,8 +9805,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 211,
-            "parent_pointer" : 146,
+            "pointer" : 213,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "column" : 38
@@ -9805,12 +9827,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 107,
+              "decl_pointer" : 109,
               "name" : {
                 "name" : "str",
                 "qual_name" : [
@@ -9822,7 +9844,7 @@
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 128,
+                  "pointer" : 130,
                   "source_range" : (
                     {
                       "column" : 38
@@ -9849,7 +9871,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 129,
+                  "pointer" : 131,
                   "source_range" : (
                     {
                     },
@@ -9865,7 +9887,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -9873,7 +9895,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 130,
+                  "pointer" : 132,
                   "source_range" : (
                     {
                     },
@@ -9900,8 +9922,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 316,
-            "parent_pointer" : 146,
+            "pointer" : 318,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "line" : 20,
@@ -9923,12 +9945,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 112
+              "type_ptr" : 114
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 111,
+              "decl_pointer" : 113,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -9940,7 +9962,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 131,
+                  "pointer" : 133,
                   "source_range" : (
                     {
                     },
@@ -9956,7 +9978,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -9964,7 +9986,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 132,
+                  "pointer" : 134,
                   "source_range" : (
                     {
                     },
@@ -9991,8 +10013,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 317,
-            "parent_pointer" : 146,
+            "pointer" : 319,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "column" : 36
@@ -10013,12 +10035,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 111,
+              "decl_pointer" : 113,
               "name" : {
                 "name" : "x",
                 "qual_name" : [
@@ -10030,7 +10052,7 @@
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 133,
+                  "pointer" : 135,
                   "source_range" : (
                     {
                       "column" : 36
@@ -10047,7 +10069,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 112
+                  "type_ptr" : 114
                 },
                 {
                   "parm_index_in_function" : 0
@@ -10057,7 +10079,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 134,
+                  "pointer" : 136,
                   "source_range" : (
                     {
                     },
@@ -10073,7 +10095,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10081,7 +10103,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 135,
+                  "pointer" : 137,
                   "source_range" : (
                     {
                     },
@@ -10108,8 +10130,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 318,
-            "parent_pointer" : 146,
+            "pointer" : 320,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "line" : 21,
@@ -10136,7 +10158,7 @@
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 116,
+              "decl_pointer" : 118,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -10148,7 +10170,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 136,
+                  "pointer" : 138,
                   "source_range" : (
                     {
                     },
@@ -10164,7 +10186,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10172,7 +10194,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 137,
+                  "pointer" : 139,
                   "source_range" : (
                     {
                     },
@@ -10199,8 +10221,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 319,
-            "parent_pointer" : 146,
+            "pointer" : 321,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "column" : 34
@@ -10221,12 +10243,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 116,
+              "decl_pointer" : 118,
               "name" : {
                 "name" : "y",
                 "qual_name" : [
@@ -10238,7 +10260,7 @@
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 138,
+                  "pointer" : 140,
                   "source_range" : (
                     {
                       "column" : 34
@@ -10265,7 +10287,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 139,
+                  "pointer" : 141,
                   "source_range" : (
                     {
                     },
@@ -10281,7 +10303,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10289,7 +10311,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 140,
+                  "pointer" : 142,
                   "source_range" : (
                     {
                     },
@@ -10316,8 +10338,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 320,
-            "parent_pointer" : 146,
+            "pointer" : 322,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "line" : 22,
@@ -10339,12 +10361,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 121
+              "type_ptr" : 123
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 120,
+              "decl_pointer" : 122,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -10356,7 +10378,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 141,
+                  "pointer" : 143,
                   "source_range" : (
                     {
                     },
@@ -10372,7 +10394,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10380,7 +10402,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 142,
+                  "pointer" : 144,
                   "source_range" : (
                     {
                     },
@@ -10407,8 +10429,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 321,
-            "parent_pointer" : 146,
+            "pointer" : 323,
+            "parent_pointer" : 148,
             "source_range" : (
               {
                 "column" : 54
@@ -10429,12 +10451,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "is_property_accessor" : true,
             "property_decl" : {
               "kind" : <"ObjCProperty">,
-              "decl_pointer" : 120,
+              "decl_pointer" : 122,
               "name" : {
                 "name" : "delegate",
                 "qual_name" : [
@@ -10446,7 +10468,7 @@
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 143,
+                  "pointer" : 145,
                   "source_range" : (
                     {
                       "column" : 54
@@ -10463,7 +10485,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 121
+                  "type_ptr" : 123
                 },
                 {
                   "parm_index_in_function" : 0
@@ -10473,7 +10495,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 144,
+                  "pointer" : 146,
                   "source_range" : (
                     {
                     },
@@ -10489,7 +10511,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10497,7 +10519,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 145,
+                  "pointer" : 147,
                   "source_range" : (
                     {
                     },
@@ -10528,7 +10550,7 @@
       {
         "class_interface" : {
           "kind" : <"ObjCInterface">,
-          "decl_pointer" : 106,
+          "decl_pointer" : 108,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -10540,7 +10562,7 @@
     )>,
     <"ObjCCategoryDecl" : (
       {
-        "pointer" : 147,
+        "pointer" : 149,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -10562,8 +10584,8 @@
       [
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 322,
-            "parent_pointer" : 147,
+            "pointer" : 324,
+            "parent_pointer" : 149,
             "source_range" : (
               {
                 "line" : 69,
@@ -10584,12 +10606,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 323,
+                  "pointer" : 325,
                   "source_range" : (
                     {
                       "column" : 14
@@ -10616,7 +10638,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 324,
+                  "pointer" : 326,
                   "source_range" : (
                     {
                     },
@@ -10632,7 +10654,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10640,7 +10662,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 325,
+                  "pointer" : 327,
                   "source_range" : (
                     {
                     },
@@ -10671,7 +10693,7 @@
       {
         "class_interface" : {
           "kind" : <"ObjCInterface">,
-          "decl_pointer" : 106,
+          "decl_pointer" : 108,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -10681,7 +10703,7 @@
         },
         "implementation" : {
           "kind" : <"ObjCCategoryImpl">,
-          "decl_pointer" : 326,
+          "decl_pointer" : 328,
           "name" : {
             "name" : "MyCategory",
             "qual_name" : [
@@ -10693,7 +10715,7 @@
     )>,
     <"ObjCCategoryImplDecl" : (
       {
-        "pointer" : 326,
+        "pointer" : 328,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -10715,8 +10737,8 @@
       [
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 327,
-            "parent_pointer" : 326,
+            "pointer" : 329,
+            "parent_pointer" : 328,
             "source_range" : (
               {
                 "line" : 75,
@@ -10738,12 +10760,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 328,
+                  "pointer" : 330,
                   "source_range" : (
                     {
                       "line" : 75,
@@ -10771,7 +10793,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 329,
+                  "pointer" : 331,
                   "source_range" : (
                     {
                     },
@@ -10789,7 +10811,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 126,
+                  "type_ptr" : 128,
                   "is_const" : true
                 },
                 {
@@ -10797,7 +10819,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 330,
+                  "pointer" : 332,
                   "source_range" : (
                     {
                     },
@@ -10821,7 +10843,7 @@
             ],
             "body" : <"CompoundStmt" : (
               {
-                "pointer" : 331,
+                "pointer" : 333,
                 "source_range" : (
                   {
                     "column" : 27
@@ -10835,7 +10857,7 @@
               [
                 <"PseudoObjectExpr" : (
                   {
-                    "pointer" : 332,
+                    "pointer" : 334,
                     "source_range" : (
                       {
                         "line" : 76,
@@ -10849,7 +10871,7 @@
                   [
                     <"BinaryOperator" : (
                       {
-                        "pointer" : 333,
+                        "pointer" : 335,
                         "source_range" : (
                           {
                             "column" : 3
@@ -10862,7 +10884,7 @@
                       [
                         <"ObjCPropertyRefExpr" : (
                           {
-                            "pointer" : 334,
+                            "pointer" : 336,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -10875,7 +10897,7 @@
                           [
                             <"OpaqueValueExpr" : (
                               {
-                                "pointer" : 335,
+                                "pointer" : 337,
                                 "source_range" : (
                                   {
                                     "column" : 3
@@ -10889,13 +10911,13 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
                                 "source_expr" : <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 336,
+                                    "pointer" : 338,
                                     "source_range" : (
                                       {
                                         "column" : 3
@@ -10908,7 +10930,7 @@
                                   [
                                     <"DeclRefExpr" : (
                                       {
-                                        "pointer" : 337,
+                                        "pointer" : 339,
                                         "source_range" : (
                                           {
                                             "column" : 3
@@ -10922,7 +10944,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 126,
+                                          "type_ptr" : 128,
                                           "is_const" : true
                                         },
                                         "value_kind" : <"LValue">
@@ -10930,7 +10952,7 @@
                                       {
                                         "decl_ref" : {
                                           "kind" : <"ImplicitParam">,
-                                          "decl_pointer" : 329,
+                                          "decl_pointer" : 331,
                                           "name" : {
                                             "name" : "self",
                                             "qual_name" : [
@@ -10938,7 +10960,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 126,
+                                            "type_ptr" : 128,
                                             "is_const" : true
                                           }
                                         }
@@ -10947,7 +10969,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126
+                                      "type_ptr" : 128
                                     }
                                   },
                                   {
@@ -10961,7 +10983,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 205
+                              "type_ptr" : 207
                             },
                             "value_kind" : <"LValue">,
                             "object_kind" : <"ObjCProperty">
@@ -10969,7 +10991,7 @@
                           {
                             "kind" : <"PropertyRef" : {
                               "kind" : <"ObjCProperty">,
-                              "decl_pointer" : 111,
+                              "decl_pointer" : 113,
                               "name" : {
                                 "name" : "x",
                                 "qual_name" : [
@@ -10983,7 +11005,7 @@
                         )>,
                         <"OpaqueValueExpr" : (
                           {
-                            "pointer" : 338,
+                            "pointer" : 340,
                             "source_range" : (
                               {
                                 "column" : 12
@@ -10997,13 +11019,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 112
+                              "type_ptr" : 114
                             }
                           },
                           {
                             "source_expr" : <"ParenExpr" : (
                               {
-                                "pointer" : 339,
+                                "pointer" : 341,
                                 "source_range" : (
                                   {
                                     "column" : 12
@@ -11016,7 +11038,7 @@
                               [
                                 <"CStyleCastExpr" : (
                                   {
-                                    "pointer" : 340,
+                                    "pointer" : 342,
                                     "source_range" : (
                                       {
                                         "column" : 12
@@ -11029,7 +11051,7 @@
                                   [
                                     <"IntegerLiteral" : (
                                       {
-                                        "pointer" : 341,
+                                        "pointer" : 343,
                                         "source_range" : (
                                           {
                                             "column" : 12
@@ -11055,7 +11077,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 112
+                                      "type_ptr" : 114
                                     }
                                   },
                                   {
@@ -11064,13 +11086,13 @@
                                     ]
                                   },
                                   {
-                                    "type_ptr" : 112
+                                    "type_ptr" : 114
                                   }
                                 )>
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 112
+                                  "type_ptr" : 114
                                 }
                               }
                             )>
@@ -11079,7 +11101,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 112
+                          "type_ptr" : 114
                         }
                       },
                       {
@@ -11088,7 +11110,7 @@
                     )>,
                     <"OpaqueValueExpr" : (
                       {
-                        "pointer" : 335,
+                        "pointer" : 337,
                         "source_range" : (
                           {
                             "column" : 3
@@ -11102,13 +11124,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 126
+                          "type_ptr" : 128
                         }
                       },
                       {
                         "source_expr" : <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 336,
+                            "pointer" : 338,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -11121,7 +11143,7 @@
                           [
                             <"DeclRefExpr" : (
                               {
-                                "pointer" : 337,
+                                "pointer" : 339,
                                 "source_range" : (
                                   {
                                     "column" : 3
@@ -11135,7 +11157,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126,
+                                  "type_ptr" : 128,
                                   "is_const" : true
                                 },
                                 "value_kind" : <"LValue">
@@ -11143,7 +11165,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : <"ImplicitParam">,
-                                  "decl_pointer" : 329,
+                                  "decl_pointer" : 331,
                                   "name" : {
                                     "name" : "self",
                                     "qual_name" : [
@@ -11151,7 +11173,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 126,
+                                    "type_ptr" : 128,
                                     "is_const" : true
                                   }
                                 }
@@ -11160,7 +11182,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
@@ -11173,7 +11195,7 @@
                     )>,
                     <"OpaqueValueExpr" : (
                       {
-                        "pointer" : 338,
+                        "pointer" : 340,
                         "source_range" : (
                           {
                             "column" : 12
@@ -11187,13 +11209,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 112
+                          "type_ptr" : 114
                         }
                       },
                       {
                         "source_expr" : <"ParenExpr" : (
                           {
-                            "pointer" : 339,
+                            "pointer" : 341,
                             "source_range" : (
                               {
                                 "column" : 12
@@ -11206,7 +11228,7 @@
                           [
                             <"CStyleCastExpr" : (
                               {
-                                "pointer" : 340,
+                                "pointer" : 342,
                                 "source_range" : (
                                   {
                                     "column" : 12
@@ -11219,7 +11241,7 @@
                               [
                                 <"IntegerLiteral" : (
                                   {
-                                    "pointer" : 341,
+                                    "pointer" : 343,
                                     "source_range" : (
                                       {
                                         "column" : 12
@@ -11245,7 +11267,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 112
+                                  "type_ptr" : 114
                                 }
                               },
                               {
@@ -11254,13 +11276,13 @@
                                 ]
                               },
                               {
-                                "type_ptr" : 112
+                                "type_ptr" : 114
                               }
                             )>
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 112
+                              "type_ptr" : 114
                             }
                           }
                         )>
@@ -11268,7 +11290,7 @@
                     )>,
                     <"ObjCMessageExpr" : (
                       {
-                        "pointer" : 342,
+                        "pointer" : 344,
                         "source_range" : (
                           {
                             "column" : 8
@@ -11281,7 +11303,7 @@
                       [
                         <"OpaqueValueExpr" : (
                           {
-                            "pointer" : 335,
+                            "pointer" : 337,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -11295,13 +11317,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
                             "source_expr" : <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 336,
+                                "pointer" : 338,
                                 "source_range" : (
                                   {
                                     "column" : 3
@@ -11314,7 +11336,7 @@
                               [
                                 <"DeclRefExpr" : (
                                   {
-                                    "pointer" : 337,
+                                    "pointer" : 339,
                                     "source_range" : (
                                       {
                                         "column" : 3
@@ -11328,7 +11350,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126,
+                                      "type_ptr" : 128,
                                       "is_const" : true
                                     },
                                     "value_kind" : <"LValue">
@@ -11336,7 +11358,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : <"ImplicitParam">,
-                                      "decl_pointer" : 329,
+                                      "decl_pointer" : 331,
                                       "name" : {
                                         "name" : "self",
                                         "qual_name" : [
@@ -11344,7 +11366,7 @@
                                         ]
                                       },
                                       "qual_type" : {
-                                        "type_ptr" : 126,
+                                        "type_ptr" : 128,
                                         "is_const" : true
                                       }
                                     }
@@ -11353,7 +11375,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -11366,7 +11388,7 @@
                         )>,
                         <"OpaqueValueExpr" : (
                           {
-                            "pointer" : 338,
+                            "pointer" : 340,
                             "source_range" : (
                               {
                                 "column" : 12
@@ -11380,13 +11402,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 112
+                              "type_ptr" : 114
                             }
                           },
                           {
                             "source_expr" : <"ParenExpr" : (
                               {
-                                "pointer" : 339,
+                                "pointer" : 341,
                                 "source_range" : (
                                   {
                                     "column" : 12
@@ -11399,7 +11421,7 @@
                               [
                                 <"CStyleCastExpr" : (
                                   {
-                                    "pointer" : 340,
+                                    "pointer" : 342,
                                     "source_range" : (
                                       {
                                         "column" : 12
@@ -11412,7 +11434,7 @@
                                   [
                                     <"IntegerLiteral" : (
                                       {
-                                        "pointer" : 341,
+                                        "pointer" : 343,
                                         "source_range" : (
                                           {
                                             "column" : 12
@@ -11438,7 +11460,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 112
+                                      "type_ptr" : 114
                                     }
                                   },
                                   {
@@ -11447,13 +11469,13 @@
                                     ]
                                   },
                                   {
-                                    "type_ptr" : 112
+                                    "type_ptr" : 114
                                   }
                                 )>
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 112
+                                  "type_ptr" : 114
                                 }
                               }
                             )>
@@ -11462,25 +11484,25 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       },
                       {
                         "selector" : "setX:",
                         "is_definition_found" : true,
-                        "decl_pointer" : 317
+                        "decl_pointer" : 319
                       }
                     )>
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 112
+                      "type_ptr" : 114
                     }
                   }
                 )>,
                 <"PseudoObjectExpr" : (
                   {
-                    "pointer" : 343,
+                    "pointer" : 345,
                     "source_range" : (
                       {
                         "line" : 77,
@@ -11494,7 +11516,7 @@
                   [
                     <"BinaryOperator" : (
                       {
-                        "pointer" : 344,
+                        "pointer" : 346,
                         "source_range" : (
                           {
                             "column" : 3
@@ -11507,7 +11529,7 @@
                       [
                         <"ObjCPropertyRefExpr" : (
                           {
-                            "pointer" : 345,
+                            "pointer" : 347,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -11520,7 +11542,7 @@
                           [
                             <"OpaqueValueExpr" : (
                               {
-                                "pointer" : 346,
+                                "pointer" : 348,
                                 "source_range" : (
                                   {
                                     "column" : 3
@@ -11534,13 +11556,13 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
                                 "source_expr" : <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 347,
+                                    "pointer" : 349,
                                     "source_range" : (
                                       {
                                         "column" : 3
@@ -11553,7 +11575,7 @@
                                   [
                                     <"DeclRefExpr" : (
                                       {
-                                        "pointer" : 348,
+                                        "pointer" : 350,
                                         "source_range" : (
                                           {
                                             "column" : 3
@@ -11567,7 +11589,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 126,
+                                          "type_ptr" : 128,
                                           "is_const" : true
                                         },
                                         "value_kind" : <"LValue">
@@ -11575,7 +11597,7 @@
                                       {
                                         "decl_ref" : {
                                           "kind" : <"ImplicitParam">,
-                                          "decl_pointer" : 329,
+                                          "decl_pointer" : 331,
                                           "name" : {
                                             "name" : "self",
                                             "qual_name" : [
@@ -11583,7 +11605,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 126,
+                                            "type_ptr" : 128,
                                             "is_const" : true
                                           }
                                         }
@@ -11592,7 +11614,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126
+                                      "type_ptr" : 128
                                     }
                                   },
                                   {
@@ -11606,7 +11628,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 205
+                              "type_ptr" : 207
                             },
                             "value_kind" : <"LValue">,
                             "object_kind" : <"ObjCProperty">
@@ -11614,7 +11636,7 @@
                           {
                             "kind" : <"PropertyRef" : {
                               "kind" : <"ObjCProperty">,
-                              "decl_pointer" : 116,
+                              "decl_pointer" : 118,
                               "name" : {
                                 "name" : "y",
                                 "qual_name" : [
@@ -11628,7 +11650,7 @@
                         )>,
                         <"OpaqueValueExpr" : (
                           {
-                            "pointer" : 349,
+                            "pointer" : 351,
                             "source_range" : (
                               {
                                 "column" : 12
@@ -11648,7 +11670,7 @@
                           {
                             "source_expr" : <"IntegerLiteral" : (
                               {
-                                "pointer" : 350,
+                                "pointer" : 352,
                                 "source_range" : (
                                   {
                                     "column" : 12
@@ -11685,7 +11707,7 @@
                     )>,
                     <"OpaqueValueExpr" : (
                       {
-                        "pointer" : 346,
+                        "pointer" : 348,
                         "source_range" : (
                           {
                             "column" : 3
@@ -11699,13 +11721,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 126
+                          "type_ptr" : 128
                         }
                       },
                       {
                         "source_expr" : <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 347,
+                            "pointer" : 349,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -11718,7 +11740,7 @@
                           [
                             <"DeclRefExpr" : (
                               {
-                                "pointer" : 348,
+                                "pointer" : 350,
                                 "source_range" : (
                                   {
                                     "column" : 3
@@ -11732,7 +11754,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126,
+                                  "type_ptr" : 128,
                                   "is_const" : true
                                 },
                                 "value_kind" : <"LValue">
@@ -11740,7 +11762,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : <"ImplicitParam">,
-                                  "decl_pointer" : 329,
+                                  "decl_pointer" : 331,
                                   "name" : {
                                     "name" : "self",
                                     "qual_name" : [
@@ -11748,7 +11770,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 126,
+                                    "type_ptr" : 128,
                                     "is_const" : true
                                   }
                                 }
@@ -11757,7 +11779,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
@@ -11770,7 +11792,7 @@
                     )>,
                     <"OpaqueValueExpr" : (
                       {
-                        "pointer" : 349,
+                        "pointer" : 351,
                         "source_range" : (
                           {
                             "column" : 12
@@ -11790,7 +11812,7 @@
                       {
                         "source_expr" : <"IntegerLiteral" : (
                           {
-                            "pointer" : 350,
+                            "pointer" : 352,
                             "source_range" : (
                               {
                                 "column" : 12
@@ -11817,7 +11839,7 @@
                     )>,
                     <"ObjCMessageExpr" : (
                       {
-                        "pointer" : 351,
+                        "pointer" : 353,
                         "source_range" : (
                           {
                             "column" : 8
@@ -11830,7 +11852,7 @@
                       [
                         <"OpaqueValueExpr" : (
                           {
-                            "pointer" : 346,
+                            "pointer" : 348,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -11844,13 +11866,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
                             "source_expr" : <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 347,
+                                "pointer" : 349,
                                 "source_range" : (
                                   {
                                     "column" : 3
@@ -11863,7 +11885,7 @@
                               [
                                 <"DeclRefExpr" : (
                                   {
-                                    "pointer" : 348,
+                                    "pointer" : 350,
                                     "source_range" : (
                                       {
                                         "column" : 3
@@ -11877,7 +11899,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126,
+                                      "type_ptr" : 128,
                                       "is_const" : true
                                     },
                                     "value_kind" : <"LValue">
@@ -11885,7 +11907,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : <"ImplicitParam">,
-                                      "decl_pointer" : 329,
+                                      "decl_pointer" : 331,
                                       "name" : {
                                         "name" : "self",
                                         "qual_name" : [
@@ -11893,7 +11915,7 @@
                                         ]
                                       },
                                       "qual_type" : {
-                                        "type_ptr" : 126,
+                                        "type_ptr" : 128,
                                         "is_const" : true
                                       }
                                     }
@@ -11902,7 +11924,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -11915,7 +11937,7 @@
                         )>,
                         <"OpaqueValueExpr" : (
                           {
-                            "pointer" : 349,
+                            "pointer" : 351,
                             "source_range" : (
                               {
                                 "column" : 12
@@ -11935,7 +11957,7 @@
                           {
                             "source_expr" : <"IntegerLiteral" : (
                               {
-                                "pointer" : 350,
+                                "pointer" : 352,
                                 "source_range" : (
                                   {
                                     "column" : 12
@@ -11963,13 +11985,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       },
                       {
                         "selector" : "setY:",
                         "is_definition_found" : true,
-                        "decl_pointer" : 319
+                        "decl_pointer" : 321
                       }
                     )>
                   ],
@@ -11981,7 +12003,7 @@
                 )>,
                 <"PseudoObjectExpr" : (
                   {
-                    "pointer" : 352,
+                    "pointer" : 354,
                     "source_range" : (
                       {
                         "line" : 78,
@@ -11995,7 +12017,7 @@
                   [
                     <"BinaryOperator" : (
                       {
-                        "pointer" : 353,
+                        "pointer" : 355,
                         "source_range" : (
                           {
                             "column" : 3
@@ -12008,7 +12030,7 @@
                       [
                         <"ObjCPropertyRefExpr" : (
                           {
-                            "pointer" : 354,
+                            "pointer" : 356,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -12021,7 +12043,7 @@
                           [
                             <"OpaqueValueExpr" : (
                               {
-                                "pointer" : 355,
+                                "pointer" : 357,
                                 "source_range" : (
                                   {
                                     "column" : 3
@@ -12035,13 +12057,13 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
                                 "source_expr" : <"ImplicitCastExpr" : (
                                   {
-                                    "pointer" : 356,
+                                    "pointer" : 358,
                                     "source_range" : (
                                       {
                                         "column" : 3
@@ -12054,7 +12076,7 @@
                                   [
                                     <"DeclRefExpr" : (
                                       {
-                                        "pointer" : 357,
+                                        "pointer" : 359,
                                         "source_range" : (
                                           {
                                             "column" : 3
@@ -12068,7 +12090,7 @@
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 126,
+                                          "type_ptr" : 128,
                                           "is_const" : true
                                         },
                                         "value_kind" : <"LValue">
@@ -12076,7 +12098,7 @@
                                       {
                                         "decl_ref" : {
                                           "kind" : <"ImplicitParam">,
-                                          "decl_pointer" : 329,
+                                          "decl_pointer" : 331,
                                           "name" : {
                                             "name" : "self",
                                             "qual_name" : [
@@ -12084,7 +12106,7 @@
                                             ]
                                           },
                                           "qual_type" : {
-                                            "type_ptr" : 126,
+                                            "type_ptr" : 128,
                                             "is_const" : true
                                           }
                                         }
@@ -12093,7 +12115,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126
+                                      "type_ptr" : 128
                                     }
                                   },
                                   {
@@ -12107,7 +12129,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 205
+                              "type_ptr" : 207
                             },
                             "value_kind" : <"LValue">,
                             "object_kind" : <"ObjCProperty">
@@ -12115,7 +12137,7 @@
                           {
                             "kind" : <"PropertyRef" : {
                               "kind" : <"ObjCProperty">,
-                              "decl_pointer" : 120,
+                              "decl_pointer" : 122,
                               "name" : {
                                 "name" : "delegate",
                                 "qual_name" : [
@@ -12129,7 +12151,7 @@
                         )>,
                         <"OpaqueValueExpr" : (
                           {
-                            "pointer" : 358,
+                            "pointer" : 360,
                             "source_range" : (
                               {
                                 "column" : 19
@@ -12149,7 +12171,7 @@
                           {
                             "source_expr" : <"ParenExpr" : (
                               {
-                                "pointer" : 359,
+                                "pointer" : 361,
                                 "source_range" : (
                                   {
                                     "column" : 19
@@ -12162,7 +12184,7 @@
                               [
                                 <"CStyleCastExpr" : (
                                   {
-                                    "pointer" : 360,
+                                    "pointer" : 362,
                                     "source_range" : (
                                       {
                                         "column" : 19
@@ -12175,7 +12197,7 @@
                                   [
                                     <"IntegerLiteral" : (
                                       {
-                                        "pointer" : 361,
+                                        "pointer" : 363,
                                         "source_range" : (
                                           {
                                             "column" : 19
@@ -12234,7 +12256,7 @@
                     )>,
                     <"OpaqueValueExpr" : (
                       {
-                        "pointer" : 355,
+                        "pointer" : 357,
                         "source_range" : (
                           {
                             "column" : 3
@@ -12248,13 +12270,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 126
+                          "type_ptr" : 128
                         }
                       },
                       {
                         "source_expr" : <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 356,
+                            "pointer" : 358,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -12267,7 +12289,7 @@
                           [
                             <"DeclRefExpr" : (
                               {
-                                "pointer" : 357,
+                                "pointer" : 359,
                                 "source_range" : (
                                   {
                                     "column" : 3
@@ -12281,7 +12303,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126,
+                                  "type_ptr" : 128,
                                   "is_const" : true
                                 },
                                 "value_kind" : <"LValue">
@@ -12289,7 +12311,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : <"ImplicitParam">,
-                                  "decl_pointer" : 329,
+                                  "decl_pointer" : 331,
                                   "name" : {
                                     "name" : "self",
                                     "qual_name" : [
@@ -12297,7 +12319,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 126,
+                                    "type_ptr" : 128,
                                     "is_const" : true
                                   }
                                 }
@@ -12306,7 +12328,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
@@ -12319,7 +12341,7 @@
                     )>,
                     <"OpaqueValueExpr" : (
                       {
-                        "pointer" : 358,
+                        "pointer" : 360,
                         "source_range" : (
                           {
                             "column" : 19
@@ -12339,7 +12361,7 @@
                       {
                         "source_expr" : <"ParenExpr" : (
                           {
-                            "pointer" : 359,
+                            "pointer" : 361,
                             "source_range" : (
                               {
                                 "column" : 19
@@ -12352,7 +12374,7 @@
                           [
                             <"CStyleCastExpr" : (
                               {
-                                "pointer" : 360,
+                                "pointer" : 362,
                                 "source_range" : (
                                   {
                                     "column" : 19
@@ -12365,7 +12387,7 @@
                               [
                                 <"IntegerLiteral" : (
                                   {
-                                    "pointer" : 361,
+                                    "pointer" : 363,
                                     "source_range" : (
                                       {
                                         "column" : 19
@@ -12414,7 +12436,7 @@
                     )>,
                     <"OpaqueValueExpr" : (
                       {
-                        "pointer" : 362,
+                        "pointer" : 364,
                         "source_range" : (
                           {
                             "column" : 19
@@ -12428,13 +12450,13 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 121
+                          "type_ptr" : 123
                         }
                       },
                       {
                         "source_expr" : <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 363,
+                            "pointer" : 365,
                             "source_range" : (
                               {
                                 "column" : 19
@@ -12447,7 +12469,7 @@
                           [
                             <"OpaqueValueExpr" : (
                               {
-                                "pointer" : 358,
+                                "pointer" : 360,
                                 "source_range" : (
                                   {
                                     "column" : 19
@@ -12467,7 +12489,7 @@
                               {
                                 "source_expr" : <"ParenExpr" : (
                                   {
-                                    "pointer" : 359,
+                                    "pointer" : 361,
                                     "source_range" : (
                                       {
                                         "column" : 19
@@ -12480,7 +12502,7 @@
                                   [
                                     <"CStyleCastExpr" : (
                                       {
-                                        "pointer" : 360,
+                                        "pointer" : 362,
                                         "source_range" : (
                                           {
                                             "column" : 19
@@ -12493,7 +12515,7 @@
                                       [
                                         <"IntegerLiteral" : (
                                           {
-                                            "pointer" : 361,
+                                            "pointer" : 363,
                                             "source_range" : (
                                               {
                                                 "column" : 19
@@ -12543,7 +12565,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 121
+                              "type_ptr" : 123
                             }
                           },
                           {
@@ -12556,7 +12578,7 @@
                     )>,
                     <"ObjCMessageExpr" : (
                       {
-                        "pointer" : 364,
+                        "pointer" : 366,
                         "source_range" : (
                           {
                             "column" : 8
@@ -12569,7 +12591,7 @@
                       [
                         <"OpaqueValueExpr" : (
                           {
-                            "pointer" : 355,
+                            "pointer" : 357,
                             "source_range" : (
                               {
                                 "column" : 3
@@ -12583,13 +12605,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 126
+                              "type_ptr" : 128
                             }
                           },
                           {
                             "source_expr" : <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 356,
+                                "pointer" : 358,
                                 "source_range" : (
                                   {
                                     "column" : 3
@@ -12602,7 +12624,7 @@
                               [
                                 <"DeclRefExpr" : (
                                   {
-                                    "pointer" : 357,
+                                    "pointer" : 359,
                                     "source_range" : (
                                       {
                                         "column" : 3
@@ -12616,7 +12638,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126,
+                                      "type_ptr" : 128,
                                       "is_const" : true
                                     },
                                     "value_kind" : <"LValue">
@@ -12624,7 +12646,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : <"ImplicitParam">,
-                                      "decl_pointer" : 329,
+                                      "decl_pointer" : 331,
                                       "name" : {
                                         "name" : "self",
                                         "qual_name" : [
@@ -12632,7 +12654,7 @@
                                         ]
                                       },
                                       "qual_type" : {
-                                        "type_ptr" : 126,
+                                        "type_ptr" : 128,
                                         "is_const" : true
                                       }
                                     }
@@ -12641,7 +12663,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -12654,7 +12676,7 @@
                         )>,
                         <"OpaqueValueExpr" : (
                           {
-                            "pointer" : 362,
+                            "pointer" : 364,
                             "source_range" : (
                               {
                                 "column" : 19
@@ -12668,13 +12690,13 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 121
+                              "type_ptr" : 123
                             }
                           },
                           {
                             "source_expr" : <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 363,
+                                "pointer" : 365,
                                 "source_range" : (
                                   {
                                     "column" : 19
@@ -12687,7 +12709,7 @@
                               [
                                 <"OpaqueValueExpr" : (
                                   {
-                                    "pointer" : 358,
+                                    "pointer" : 360,
                                     "source_range" : (
                                       {
                                         "column" : 19
@@ -12707,7 +12729,7 @@
                                   {
                                     "source_expr" : <"ParenExpr" : (
                                       {
-                                        "pointer" : 359,
+                                        "pointer" : 361,
                                         "source_range" : (
                                           {
                                             "column" : 19
@@ -12720,7 +12742,7 @@
                                       [
                                         <"CStyleCastExpr" : (
                                           {
-                                            "pointer" : 360,
+                                            "pointer" : 362,
                                             "source_range" : (
                                               {
                                                 "column" : 19
@@ -12733,7 +12755,7 @@
                                           [
                                             <"IntegerLiteral" : (
                                               {
-                                                "pointer" : 361,
+                                                "pointer" : 363,
                                                 "source_range" : (
                                                   {
                                                     "column" : 19
@@ -12783,7 +12805,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 121
+                                  "type_ptr" : 123
                                 }
                               },
                               {
@@ -12797,19 +12819,19 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       },
                       {
                         "selector" : "setDelegate:",
                         "is_definition_found" : true,
-                        "decl_pointer" : 321
+                        "decl_pointer" : 323
                       }
                     )>
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 121
+                      "type_ptr" : 123
                     }
                   }
                 )>
@@ -12824,7 +12846,7 @@
       {
         "class_interface" : {
           "kind" : <"ObjCInterface">,
-          "decl_pointer" : 106,
+          "decl_pointer" : 108,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -12834,7 +12856,7 @@
         },
         "category_decl" : {
           "kind" : <"ObjCCategory">,
-          "decl_pointer" : 147,
+          "decl_pointer" : 149,
           "name" : {
             "name" : "MyCategory",
             "qual_name" : [
@@ -12846,7 +12868,7 @@
     )>,
     <"ObjCInterfaceDecl" : (
       {
-        "pointer" : 365,
+        "pointer" : 367,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -12884,7 +12906,7 @@
     )>,
     <"ObjCInterfaceDecl" : (
       {
-        "pointer" : 366,
+        "pointer" : 368,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -12906,8 +12928,8 @@
       [
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 367,
-            "parent_pointer" : 366,
+            "pointer" : 369,
+            "parent_pointer" : 368,
             "source_range" : (
               {
                 "line" : 88,
@@ -12920,7 +12942,7 @@
             "attributes" : [
               <"NSReturnsRetainedAttr" : (
                 {
-                  "pointer" : 368,
+                  "pointer" : 370,
                   "source_range" : (
                     {
                     },
@@ -12945,7 +12967,7 @@
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 369,
+                  "pointer" : 371,
                   "source_range" : (
                     {
                       "column" : 28
@@ -12962,7 +12984,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 370
+                  "type_ptr" : 372
                 },
                 {
                   "parm_index_in_function" : 0
@@ -12972,7 +12994,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 371,
+                  "pointer" : 373,
                   "source_range" : (
                     {
                     },
@@ -12996,7 +13018,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 372,
+                  "pointer" : 374,
                   "source_range" : (
                     {
                     },
@@ -13039,7 +13061,7 @@
     )>,
     <"ObjCInterfaceDecl" : (
       {
-        "pointer" : 373,
+        "pointer" : 375,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -13065,7 +13087,7 @@
       {
         "super" : {
           "kind" : <"ObjCInterface">,
-          "decl_pointer" : 106,
+          "decl_pointer" : 108,
           "name" : {
             "name" : "MyClass",
             "qual_name" : [
@@ -13075,7 +13097,7 @@
         },
         "implementation" : {
           "kind" : <"ObjCImplementation">,
-          "decl_pointer" : 374,
+          "decl_pointer" : 376,
           "name" : {
             "name" : "MySubclass",
             "qual_name" : [
@@ -13087,7 +13109,7 @@
     )>,
     <"ObjCImplementationDecl" : (
       {
-        "pointer" : 374,
+        "pointer" : 376,
         "parent_pointer" : 1,
         "source_range" : (
           {
@@ -13109,8 +13131,8 @@
       [
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 375,
-            "parent_pointer" : 374,
+            "pointer" : 377,
+            "parent_pointer" : 376,
             "source_range" : (
               {
                 "line" : 96,
@@ -13132,12 +13154,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 376,
+                  "pointer" : 378,
                   "source_range" : (
                     {
                       "line" : 96,
@@ -13167,7 +13189,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 377,
+                  "pointer" : 379,
                   "source_range" : (
                     {
                     },
@@ -13183,7 +13205,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 378,
+                  "type_ptr" : 380,
                   "is_const" : true
                 },
                 {
@@ -13191,7 +13213,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 379,
+                  "pointer" : 381,
                   "source_range" : (
                     {
                     },
@@ -13216,7 +13238,7 @@
             "is_overriding" : true,
             "body" : <"CompoundStmt" : (
               {
-                "pointer" : 380,
+                "pointer" : 382,
                 "source_range" : (
                   {
                     "column" : 27
@@ -13230,7 +13252,7 @@
               [
                 <"ObjCMessageExpr" : (
                   {
-                    "pointer" : 381,
+                    "pointer" : 383,
                     "source_range" : (
                       {
                         "line" : 97,
@@ -13244,7 +13266,7 @@
                   [
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 382,
+                        "pointer" : 384,
                         "source_range" : (
                           {
                             "column" : 14
@@ -13257,7 +13279,7 @@
                       [
                         <"DeclRefExpr" : (
                           {
-                            "pointer" : 383,
+                            "pointer" : 385,
                             "source_range" : (
                               {
                                 "column" : 14
@@ -13278,7 +13300,7 @@
                           {
                             "decl_ref" : {
                               "kind" : <"ParmVar">,
-                              "decl_pointer" : 376,
+                              "decl_pointer" : 378,
                               "name" : {
                                 "name" : "s",
                                 "qual_name" : [
@@ -13306,13 +13328,13 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 101
+                      "type_ptr" : 103
                     }
                   },
                   {
                     "selector" : "bar:",
                     "is_definition_found" : true,
-                    "decl_pointer" : 327,
+                    "decl_pointer" : 329,
                     "receiver_kind" : <"SuperInstance">
                   }
                 )>
@@ -13323,8 +13345,8 @@
         )>,
         <"ObjCMethodDecl" : (
           {
-            "pointer" : 384,
-            "parent_pointer" : 374,
+            "pointer" : 386,
+            "parent_pointer" : 376,
             "source_range" : (
               {
                 "line" : 100,
@@ -13346,12 +13368,12 @@
           {
             "is_instance_method" : true,
             "result_type" : {
-              "type_ptr" : 101
+              "type_ptr" : 103
             },
             "parameters" : [
               <"ParmVarDecl" : (
                 {
-                  "pointer" : 385,
+                  "pointer" : 387,
                   "source_range" : (
                     {
                       "line" : 100,
@@ -13371,7 +13393,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 151
+                  "type_ptr" : 153
                 },
                 {
                   "parm_index_in_function" : 0
@@ -13381,7 +13403,7 @@
             "implicit_parameters" : [
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 386,
+                  "pointer" : 388,
                   "source_range" : (
                     {
                     },
@@ -13397,7 +13419,7 @@
                   ]
                 },
                 {
-                  "type_ptr" : 378,
+                  "type_ptr" : 380,
                   "is_const" : true
                 },
                 {
@@ -13405,7 +13427,7 @@
               )>,
               <"ImplicitParamDecl" : (
                 {
-                  "pointer" : 387,
+                  "pointer" : 389,
                   "source_range" : (
                     {
                     },
@@ -13430,7 +13452,7 @@
             "is_overriding" : true,
             "body" : <"CompoundStmt" : (
               {
-                "pointer" : 388,
+                "pointer" : 390,
                 "source_range" : (
                   {
                     "column" : 36
@@ -13444,7 +13466,7 @@
               [
                 <"ObjCMessageExpr" : (
                   {
-                    "pointer" : 389,
+                    "pointer" : 391,
                     "source_range" : (
                       {
                         "line" : 101,
@@ -13458,7 +13480,7 @@
                   [
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 390,
+                        "pointer" : 392,
                         "source_range" : (
                           {
                             "column" : 14
@@ -13471,7 +13493,7 @@
                       [
                         <"DeclRefExpr" : (
                           {
-                            "pointer" : 391,
+                            "pointer" : 393,
                             "source_range" : (
                               {
                                 "column" : 14
@@ -13485,14 +13507,14 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 151
+                              "type_ptr" : 153
                             },
                             "value_kind" : <"LValue">
                           },
                           {
                             "decl_ref" : {
                               "kind" : <"ParmVar">,
-                              "decl_pointer" : 385,
+                              "decl_pointer" : 387,
                               "name" : {
                                 "name" : "s",
                                 "qual_name" : [
@@ -13500,7 +13522,7 @@
                                 ]
                               },
                               "qual_type" : {
-                                "type_ptr" : 151
+                                "type_ptr" : 153
                               }
                             }
                           }
@@ -13508,7 +13530,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 151
+                          "type_ptr" : 153
                         }
                       },
                       {
@@ -13520,13 +13542,13 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 101
+                      "type_ptr" : 103
                     }
                   },
                   {
                     "selector" : "foo:",
                     "is_definition_found" : true,
-                    "decl_pointer" : 154,
+                    "decl_pointer" : 156,
                     "receiver_kind" : <"SuperInstance">
                   }
                 )>
@@ -13541,7 +13563,7 @@
       {
         "class_interface" : {
           "kind" : <"ObjCInterface">,
-          "decl_pointer" : 373,
+          "decl_pointer" : 375,
           "name" : {
             "name" : "MySubclass",
             "qual_name" : [
@@ -13553,7 +13575,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 392,
+        "pointer" : 394,
         "source_range" : (
           {
             "line" : 106,
@@ -13572,13 +13594,13 @@
         ]
       },
       {
-        "type_ptr" : 393
+        "type_ptr" : 395
       },
       {
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 394,
+              "pointer" : 396,
               "source_range" : (
                 {
                   "line" : 106,
@@ -13604,7 +13626,7 @@
           )>,
           <"ParmVarDecl" : (
             {
-              "pointer" : 395,
+              "pointer" : 397,
               "source_range" : (
                 {
                   "column" : 20
@@ -13621,17 +13643,17 @@
               ]
             },
             {
-              "type_ptr" : 396
+              "type_ptr" : 398
             },
             {
               "parm_index_in_function" : 1
             }
           )>
         ],
-        "decl_ptr_with_body" : 392,
+        "decl_ptr_with_body" : 394,
         "body" : <"CompoundStmt" : (
           {
-            "pointer" : 397,
+            "pointer" : 399,
             "source_range" : (
               {
                 "column" : 33
@@ -13645,7 +13667,7 @@
           [
             <"ObjCAutoreleasePoolStmt" : (
               {
-                "pointer" : 398,
+                "pointer" : 400,
                 "source_range" : (
                   {
                     "line" : 107,
@@ -13660,7 +13682,7 @@
               [
                 <"CompoundStmt" : (
                   {
-                    "pointer" : 399,
+                    "pointer" : 401,
                     "source_range" : (
                       {
                         "line" : 107,
@@ -13675,7 +13697,7 @@
                   [
                     <"ExprWithCleanups" : (
                       {
-                        "pointer" : 400,
+                        "pointer" : 402,
                         "source_range" : (
                           {
                             "line" : 108,
@@ -13689,7 +13711,7 @@
                       [
                         <"ObjCMessageExpr" : (
                           {
-                            "pointer" : 401,
+                            "pointer" : 403,
                             "source_range" : (
                               {
                                 "column" : 5
@@ -13702,7 +13724,7 @@
                           [
                             <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 402,
+                                "pointer" : 404,
                                 "source_range" : (
                                   {
                                     "column" : 6
@@ -13715,7 +13737,7 @@
                               [
                                 <"ObjCMessageExpr" : (
                                   {
-                                    "pointer" : 403,
+                                    "pointer" : 405,
                                     "source_range" : (
                                       {
                                         "column" : 6
@@ -13728,7 +13750,7 @@
                                   [
                                     <"ImplicitCastExpr" : (
                                       {
-                                        "pointer" : 404,
+                                        "pointer" : 406,
                                         "source_range" : (
                                           {
                                             "column" : 7
@@ -13741,7 +13763,7 @@
                                       [
                                         <"ObjCMessageExpr" : (
                                           {
-                                            "pointer" : 405,
+                                            "pointer" : 407,
                                             "source_range" : (
                                               {
                                                 "column" : 7
@@ -13755,21 +13777,21 @@
                                           ],
                                           {
                                             "qual_type" : {
-                                              "type_ptr" : 126
+                                              "type_ptr" : 128
                                             }
                                           },
                                           {
                                             "selector" : "alloc",
                                             "decl_pointer" : 19,
                                             "receiver_kind" : <"Class" : {
-                                              "type_ptr" : 406
+                                              "type_ptr" : 408
                                             }>
                                           }
                                         )>
                                       ],
                                       {
                                         "qual_type" : {
-                                          "type_ptr" : 126
+                                          "type_ptr" : 128
                                         }
                                       },
                                       {
@@ -13781,7 +13803,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126
+                                      "type_ptr" : 128
                                     }
                                   },
                                   {
@@ -13792,7 +13814,7 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -13803,7 +13825,7 @@
                             )>,
                             <"ObjCStringLiteral" : (
                               {
-                                "pointer" : 407,
+                                "pointer" : 409,
                                 "source_range" : (
                                   {
                                     "column" : 33
@@ -13816,7 +13838,7 @@
                               [
                                 <"StringLiteral" : (
                                   {
-                                    "pointer" : 408,
+                                    "pointer" : 410,
                                     "source_range" : (
                                       {
                                         "column" : 34
@@ -13830,7 +13852,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 409
+                                      "type_ptr" : 411
                                     },
                                     "value_kind" : <"LValue">
                                   },
@@ -13848,19 +13870,19 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 101
+                              "type_ptr" : 103
                             }
                           },
                           {
                             "selector" : "foo:",
                             "is_definition_found" : true,
-                            "decl_pointer" : 154
+                            "decl_pointer" : 156
                           }
                         )>
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       },
                       {
@@ -13868,7 +13890,7 @@
                     )>,
                     <"ExprWithCleanups" : (
                       {
-                        "pointer" : 410,
+                        "pointer" : 412,
                         "source_range" : (
                           {
                             "line" : 109,
@@ -13882,7 +13904,7 @@
                       [
                         <"ObjCMessageExpr" : (
                           {
-                            "pointer" : 411,
+                            "pointer" : 413,
                             "source_range" : (
                               {
                                 "column" : 5
@@ -13895,7 +13917,7 @@
                           [
                             <"ImplicitCastExpr" : (
                               {
-                                "pointer" : 412,
+                                "pointer" : 414,
                                 "source_range" : (
                                   {
                                     "column" : 6
@@ -13908,7 +13930,7 @@
                               [
                                 <"ObjCMessageExpr" : (
                                   {
-                                    "pointer" : 413,
+                                    "pointer" : 415,
                                     "source_range" : (
                                       {
                                         "column" : 6
@@ -13922,21 +13944,21 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 126
+                                      "type_ptr" : 128
                                     }
                                   },
                                   {
                                     "selector" : "new",
                                     "decl_pointer" : 24,
                                     "receiver_kind" : <"Class" : {
-                                      "type_ptr" : 406
+                                      "type_ptr" : 408
                                     }>
                                   }
                                 )>
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 126
+                                  "type_ptr" : 128
                                 }
                               },
                               {
@@ -13947,7 +13969,7 @@
                             )>,
                             <"ObjCStringLiteral" : (
                               {
-                                "pointer" : 414,
+                                "pointer" : 416,
                                 "source_range" : (
                                   {
                                     "column" : 24
@@ -13960,7 +13982,7 @@
                               [
                                 <"StringLiteral" : (
                                   {
-                                    "pointer" : 415,
+                                    "pointer" : 417,
                                     "source_range" : (
                                       {
                                         "column" : 25
@@ -13974,7 +13996,7 @@
                                   ],
                                   {
                                     "qual_type" : {
-                                      "type_ptr" : 409
+                                      "type_ptr" : 411
                                     },
                                     "value_kind" : <"LValue">
                                   },
@@ -13992,19 +14014,19 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 101
+                              "type_ptr" : 103
                             }
                           },
                           {
                             "selector" : "bar:",
                             "is_definition_found" : true,
-                            "decl_pointer" : 327
+                            "decl_pointer" : 329
                           }
                         )>
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 101
+                          "type_ptr" : 103
                         }
                       },
                       {
@@ -14016,7 +14038,7 @@
             )>,
             <"ReturnStmt" : (
               {
-                "pointer" : 416,
+                "pointer" : 418,
                 "source_range" : (
                   {
                     "line" : 111,
@@ -14030,7 +14052,7 @@
               [
                 <"IntegerLiteral" : (
                   {
-                    "pointer" : 417,
+                    "pointer" : 419,
                     "source_range" : (
                       {
                         "column" : 10
@@ -14061,7 +14083,7 @@
     )>,
     <"TypedefDecl" : (
       {
-        "pointer" : 418,
+        "pointer" : 420,
         "source_range" : (
           {
           },
@@ -14097,31 +14119,31 @@
     "types" : [
       <"BuiltinType" : (
         {
-          "pointer" : 101
+          "pointer" : 103
         },
         <"Void">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 419
+          "pointer" : 421
         },
         <"Bool">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 420
+          "pointer" : 422
         },
         <"Char_S">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 421
+          "pointer" : 423
         },
         <"SChar">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 422
+          "pointer" : 424
         },
         <"Short">
       )>,
@@ -14133,25 +14155,25 @@
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 423
+          "pointer" : 425
         },
         <"Long">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 424
+          "pointer" : 426
         },
         <"LongLong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 425
+          "pointer" : 427
         },
         <"UChar">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 426
+          "pointer" : 428
         },
         <"UShort">
       )>,
@@ -14163,369 +14185,375 @@
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 427
+          "pointer" : 429
         },
         <"ULong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 428
+          "pointer" : 430
         },
         <"ULongLong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 429
+          "pointer" : 431
         },
         <"Float">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 430
+          "pointer" : 432
         },
         <"Double">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 431
+          "pointer" : 433
         },
         <"LongDouble">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 432
+          "pointer" : 434
         },
         <"Float128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 433
+          "pointer" : 435
         },
         <"Float16">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 434
+          "pointer" : 436
         },
         <"ShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 435
+          "pointer" : 437
         },
         <"Accum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 436
+          "pointer" : 438
         },
         <"LongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 437
+          "pointer" : 439
         },
         <"UShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 438
+          "pointer" : 440
         },
         <"UAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 439
+          "pointer" : 441
         },
         <"ULongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 440
+          "pointer" : 442
         },
         <"ShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 441
+          "pointer" : 443
         },
         <"Fract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 442
+          "pointer" : 444
         },
         <"LongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 443
+          "pointer" : 445
         },
         <"UShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 444
+          "pointer" : 446
         },
         <"UFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 445
+          "pointer" : 447
         },
         <"ULongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 446
+          "pointer" : 448
         },
         <"SatShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 447
+          "pointer" : 449
         },
         <"SatAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 448
+          "pointer" : 450
         },
         <"SatLongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 449
+          "pointer" : 451
         },
         <"SatUShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 450
+          "pointer" : 452
         },
         <"SatUAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 451
+          "pointer" : 453
         },
         <"SatULongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 452
+          "pointer" : 454
         },
         <"SatShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 453
+          "pointer" : 455
         },
         <"SatFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 454
+          "pointer" : 456
         },
         <"SatLongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 455
+          "pointer" : 457
         },
         <"SatUShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 456
+          "pointer" : 458
         },
         <"SatUFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 457
+          "pointer" : 459
         },
         <"SatULongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 458
+          "pointer" : 460
         },
         <"Int128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 459
+          "pointer" : 461
         },
         <"UInt128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 460
+          "pointer" : 462
         },
         <"WChar_S">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 461
+          "pointer" : 463
         },
         <"Char8">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 462
+          "pointer" : 464
         },
         <"Dependent">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 463
+          "pointer" : 465
         },
         <"Overload">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 464
+          "pointer" : 466
         },
         <"BoundMember">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 205
+          "pointer" : 207
         },
         <"PseudoObject">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 465
+          "pointer" : 467
         },
         <"UnknownAny">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 466
+          "pointer" : 468
         },
         <"ARCUnbridgedCast">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 467
+          "pointer" : 469
         },
         <"BuiltinFn">
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 468
+          "pointer" : 470
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 469
+          "pointer" : 471
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 470
+          "pointer" : 472
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 471
+          "pointer" : 473
         }
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 472
+          "pointer" : 474
         },
         <"ObjCId">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 473
+          "pointer" : 475
         },
         <"ObjCClass">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 474
+          "pointer" : 476
         },
         <"ObjCSel">
       )>,
       <"PointerType" : (
         {
-          "pointer" : 112
+          "pointer" : 114
         },
         {
-          "type_ptr" : 101
+          "type_ptr" : 103
         }
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 475
+          "pointer" : 477
         },
         <"NullPtr">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 476
+          "pointer" : 478
         },
         <"Half">
       )>,
+      <"BuiltinType" : (
+        {
+          "pointer" : 479
+        },
+        <"BFloat16">
+      )>,
       <"PointerType" : (
         {
-          "pointer" : 477
+          "pointer" : 480
         },
         {
-          "type_ptr" : 474
+          "type_ptr" : 476
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 478
+          "pointer" : 481
         },
         {
-          "base_type" : 472
+          "base_type" : 474
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 479
+          "pointer" : 482
         },
         {
-          "type_ptr" : 478
+          "type_ptr" : 481
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 480
+          "pointer" : 483
         },
         {
-          "base_type" : 473
+          "base_type" : 475
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 481
+          "pointer" : 484
         },
         {
-          "type_ptr" : 480
+          "type_ptr" : 483
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 482
+          "pointer" : 485
         },
         10
       )>,
       <"RecordType" : (
         {
-          "pointer" : 483
+          "pointer" : 486
         },
-        484
+        487
       )>,
       <"PointerType" : (
         {
-          "pointer" : 485
+          "pointer" : 488
         },
         {
           "type_ptr" : 53,
@@ -14534,34 +14562,34 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 486
+          "pointer" : 489
         },
         {
-          "type_ptr" : 420,
+          "type_ptr" : 422,
           "is_const" : true
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 170
+          "pointer" : 172
         },
         {
-          "type_ptr" : 420
+          "type_ptr" : 422
         }
       )>,
       <"RecordType" : (
         {
-          "pointer" : 487
+          "pointer" : 490
         },
-        488
+        491
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 489
+          "pointer" : 492
         },
         {
           "element_type" : {
-            "type_ptr" : 487
+            "type_ptr" : 490
           },
           "stride" : 24
         },
@@ -14569,18 +14597,18 @@
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 490
+          "pointer" : 493
         },
         18
       )>,
       <"TypedefType" : (
         {
           "pointer" : 7,
-          "desugared_type" : 479
+          "desugared_type" : 482
         },
         {
           "child_type" : {
-            "type_ptr" : 479
+            "type_ptr" : 482
           },
           "decl_ptr" : 6
         }
@@ -14588,23 +14616,23 @@
       <"TypedefType" : (
         {
           "pointer" : 21,
-          "desugared_type" : 479
+          "desugared_type" : 482
         },
         {
           "child_type" : {
             "type_ptr" : 7
           },
-          "decl_ptr" : 418
+          "decl_ptr" : 420
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 9,
-          "desugared_type" : 481
+          "desugared_type" : 484
         },
         {
           "child_type" : {
-            "type_ptr" : 481
+            "type_ptr" : 484
           },
           "decl_ptr" : 8
         }
@@ -14612,11 +14640,11 @@
       <"TypedefType" : (
         {
           "pointer" : 5,
-          "desugared_type" : 477
+          "desugared_type" : 480
         },
         {
           "child_type" : {
-            "type_ptr" : 477
+            "type_ptr" : 480
           },
           "decl_ptr" : 4
         }
@@ -14626,7 +14654,7 @@
           "pointer" : 30
         },
         {
-          "type_ptr" : 490
+          "type_ptr" : 493
         }
       )>,
       <"TypedefType" : (
@@ -14646,18 +14674,18 @@
           "pointer" : 47
         },
         {
-          "type_ptr" : 482
+          "type_ptr" : 485
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 491
+          "pointer" : 494
         },
         50
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 492
+          "pointer" : 495
         },
         56
       )>,
@@ -14678,29 +14706,29 @@
           "pointer" : 59
         },
         {
-          "type_ptr" : 492
+          "type_ptr" : 495
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 493
+          "pointer" : 496
         },
         61
       )>,
       <"IncompleteArrayType" : (
         {
-          "pointer" : 494
+          "pointer" : 497
         },
         {
           "element_type" : {
-            "type_ptr" : 479
+            "type_ptr" : 482
           },
           "stride" : 8
         }
       )>,
       <"IncompleteArrayType" : (
         {
-          "pointer" : 495
+          "pointer" : 498
         },
         {
           "element_type" : {
@@ -14712,7 +14740,7 @@
       )>,
       <"IncompleteArrayType" : (
         {
-          "pointer" : 496
+          "pointer" : 499
         },
         {
           "element_type" : {
@@ -14724,16 +14752,16 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 497
+          "pointer" : 500
         },
         {
-          "type_ptr" : 479,
+          "type_ptr" : 482,
           "is_const" : true
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 498
+          "pointer" : 501
         },
         {
           "type_ptr" : 7,
@@ -14743,10 +14771,10 @@
       <"DecayedType" : (
         {
           "pointer" : 64,
-          "desugared_type" : 498
+          "desugared_type" : 501
         },
         {
-          "type_ptr" : 498
+          "type_ptr" : 501
         }
       )>,
       <"ObjCObjectPointerType" : (
@@ -14754,21 +14782,21 @@
           "pointer" : 72
         },
         {
-          "type_ptr" : 493
+          "type_ptr" : 496
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 499
+          "pointer" : 502
         },
         74
       )>,
       <"PointerType" : (
         {
-          "pointer" : 500
+          "pointer" : 503
         },
         {
-          "type_ptr" : 479
+          "type_ptr" : 482
         }
       )>,
       <"PointerType" : (
@@ -14784,22 +14812,22 @@
           "pointer" : 85
         },
         {
-          "type_ptr" : 499
+          "type_ptr" : 502
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 501
+          "pointer" : 504
         },
         87
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 502
+          "pointer" : 505
         },
         {
           "return_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 103
           }
         },
         {
@@ -14812,11 +14840,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 503
+          "pointer" : 506
         },
         {
           "return_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 103
           }
         },
         {
@@ -14829,28 +14857,28 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 504
+          "pointer" : 507
         },
         {
           "return_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 103
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 479
+              "type_ptr" : 482
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "return_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 103
           }
         },
         {
@@ -14863,40 +14891,40 @@
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 406
+          "pointer" : 408
         },
-        106
+        108
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 505
+          "pointer" : 508
         },
         {
-          "base_type" : 490,
+          "base_type" : 493,
           "protocol_decls_ptr" : [
-            105
+            107
           ]
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 121
+          "pointer" : 123
         },
         {
-          "type_ptr" : 505
+          "type_ptr" : 508
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 126
+          "pointer" : 128
         },
         {
-          "type_ptr" : 406
+          "type_ptr" : 408
         }
       )>,
       <"AttributedType" : (
         {
-          "pointer" : 151,
+          "pointer" : 153,
           "desugared_type" : 59
         },
         {
@@ -14905,11 +14933,11 @@
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 166
+          "pointer" : 168
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
@@ -14917,7 +14945,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 506
+          "pointer" : 509
         },
         {
           "type_ptr" : 53
@@ -14925,31 +14953,31 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 169
+          "pointer" : 171
         },
         {
-          "type_ptr" : 506
+          "type_ptr" : 509
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 507
+          "pointer" : 510
         },
         {
-          "type_ptr" : 504
+          "type_ptr" : 507
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 162
+          "pointer" : 164
         },
         {
-          "type_ptr" : 90
+          "type_ptr" : 91
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 508
+          "pointer" : 511
         },
         {
           "return_type" : {
@@ -14966,7 +14994,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 509
+          "pointer" : 512
         },
         {
           "return_type" : {
@@ -14983,36 +15011,36 @@
       )>,
       <"ParenType" : (
         {
-          "pointer" : 510,
-          "desugared_type" : 509
+          "pointer" : 513,
+          "desugared_type" : 512
         },
         {
-          "type_ptr" : 509
+          "type_ptr" : 512
         }
       )>,
       <"BlockPointerType" : (
         {
-          "pointer" : 511
+          "pointer" : 514
         },
         {
-          "type_ptr" : 508
+          "type_ptr" : 511
         }
       )>,
       <"BlockPointerType" : (
         {
-          "pointer" : 217
+          "pointer" : 219
         },
         {
-          "type_ptr" : 510
+          "type_ptr" : 513
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 512
+          "pointer" : 515
         },
         {
           "return_type" : {
-            "type_ptr" : 462
+            "type_ptr" : 464
           }
         },
         {
@@ -15025,11 +15053,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 513
+          "pointer" : 516
         },
         {
           "return_type" : {
-            "type_ptr" : 462
+            "type_ptr" : 464
           }
         },
         {
@@ -15042,27 +15070,27 @@
       )>,
       <"BlockPointerType" : (
         {
-          "pointer" : 195
+          "pointer" : 197
         },
         {
-          "type_ptr" : 509
+          "type_ptr" : 512
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 228
+          "pointer" : 230
         },
         {
-          "type_ptr" : 491
+          "type_ptr" : 494
         }
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 274
+          "pointer" : 276
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
@@ -15070,19 +15098,19 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 289
+          "pointer" : 291
         },
         {
-          "type_ptr" : 501
+          "type_ptr" : 504
         }
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 286
+          "pointer" : 288
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
@@ -15090,11 +15118,11 @@
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 299
+          "pointer" : 301
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
@@ -15102,11 +15130,11 @@
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 310
+          "pointer" : 312
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
@@ -15114,28 +15142,28 @@
       )>,
       <"ObjCTypeParamType" : (
         {
-          "pointer" : 514,
-          "desugared_type" : 479
+          "pointer" : 517,
+          "desugared_type" : 482
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 515
+          "pointer" : 518
         },
-        365
+        367
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 516
+          "pointer" : 519
         },
-        366
+        368
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 517
+          "pointer" : 520
         },
         {
-          "base_type" : 515,
+          "base_type" : 518,
           "type_args" : [
             {
               "type_ptr" : 30
@@ -15145,37 +15173,37 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 370
+          "pointer" : 372
         },
         {
-          "type_ptr" : 517
+          "type_ptr" : 520
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 518
+          "pointer" : 521
         },
-        373
+        375
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 378
+          "pointer" : 380
         },
         {
-          "type_ptr" : 518
+          "type_ptr" : 521
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 396
+          "pointer" : 398
         },
         {
-          "type_ptr" : 170
+          "type_ptr" : 172
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 393
+          "pointer" : 395
         },
         {
           "return_type" : {
@@ -15188,18 +15216,18 @@
               "type_ptr" : 53
             },
             {
-              "type_ptr" : 396
+              "type_ptr" : 398
             }
           ]
         }
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 409
+          "pointer" : 411
         },
         {
           "element_type" : {
-            "type_ptr" : 420
+            "type_ptr" : 422
           },
           "stride" : 1
         },
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/available_expression.m.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/available_expression.m.exp
index 8fc5c1a58..8af46189d 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/available_expression.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/available_expression.m.exp
@@ -1054,17 +1054,23 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
         },
         <"Half">
       )>,
-      <"PointerType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 95
         },
+        <"BFloat16">
+      )>,
+      <"PointerType" : (
+        {
+          "pointer" : 96
+        },
         {
           "type_ptr" : 91
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 96
+          "pointer" : 97
         },
         {
           "base_type" : 89
@@ -1072,15 +1078,15 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 97
+          "pointer" : 98
         },
         {
-          "type_ptr" : 96
+          "type_ptr" : 97
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 98
+          "pointer" : 99
         },
         {
           "base_type" : 90
@@ -1088,27 +1094,27 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 99
+          "pointer" : 100
         },
         {
-          "type_ptr" : 98
+          "type_ptr" : 99
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 100
+          "pointer" : 101
         },
         9
       )>,
       <"RecordType" : (
         {
-          "pointer" : 101
+          "pointer" : 102
         },
-        102
+        103
       )>,
       <"PointerType" : (
         {
-          "pointer" : 103
+          "pointer" : 104
         },
         {
           "type_ptr" : 20,
@@ -1117,7 +1123,7 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
       )>,
       <"PointerType" : (
         {
-          "pointer" : 104
+          "pointer" : 105
         },
         {
           "type_ptr" : 35,
@@ -1126,7 +1132,7 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
       )>,
       <"PointerType" : (
         {
-          "pointer" : 105
+          "pointer" : 106
         },
         {
           "type_ptr" : 35
@@ -1134,17 +1140,17 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
       )>,
       <"RecordType" : (
         {
-          "pointer" : 106
+          "pointer" : 107
         },
-        107
+        108
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 108
+          "pointer" : 109
         },
         {
           "element_type" : {
-            "type_ptr" : 106
+            "type_ptr" : 107
           },
           "stride" : 24
         },
@@ -1152,13 +1158,13 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 109
+          "pointer" : 110
         },
         13
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 110
+          "pointer" : 111
         },
         15
       )>,
@@ -1167,17 +1173,17 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
           "pointer" : 22
         },
         {
-          "type_ptr" : 110
+          "type_ptr" : 111
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 7,
-          "desugared_type" : 97
+          "desugared_type" : 98
         },
         {
           "child_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 98
           },
           "decl_ptr" : 6
         }
@@ -1185,7 +1191,7 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
       <"TypedefType" : (
         {
           "pointer" : 34,
-          "desugared_type" : 97
+          "desugared_type" : 98
         },
         {
           "child_type" : {
@@ -1197,11 +1203,11 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem
       <"TypedefType" : (
         {
           "pointer" : 5,
-          "desugared_type" : 95
+          "desugared_type" : 96
         },
         {
           "child_type" : {
-            "type_ptr" : 95
+            "type_ptr" : 96
           },
           "decl_ptr" : 4
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/bind_temporary.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/bind_temporary.cpp.exp
index 3aa7f4d47..b0f852d01 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/bind_temporary.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/bind_temporary.cpp.exp
@@ -218,7 +218,7 @@
             "type_ptr" : 12
           },
           {
-            "mangled_name" : "320519083853435709",
+            "mangled_name" : "18026356147569087964",
             "is_cpp" : true,
             "decl_ptr_with_body" : 11,
             "body" : <"CompoundStmt" : (
@@ -268,7 +268,7 @@
             "type_ptr" : 15
           },
           {
-            "mangled_name" : "3243028866176254141",
+            "mangled_name" : "1879755393825675851",
             "is_cpp" : true,
             "decl_ptr_with_body" : 14,
             "body" : <"CompoundStmt" : (
@@ -317,7 +317,7 @@
             "type_ptr" : 18
           },
           {
-            "mangled_name" : "1635307583371793064",
+            "mangled_name" : "1652559256541304523",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -1180,15 +1180,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 98
         },
-        99
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 99
+        },
+        100
       )>,
       <"PointerType" : (
         {
-          "pointer" : 100
+          "pointer" : 101
         },
         {
           "type_ptr" : 38,
@@ -1197,7 +1203,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 101
+          "pointer" : 102
         },
         {
           "type_ptr" : 35,
@@ -1206,7 +1212,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 102
+          "pointer" : 103
         },
         {
           "type_ptr" : 35
@@ -1214,17 +1220,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 103
+          "pointer" : 104
         },
-        104
+        105
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 105
+          "pointer" : 106
         },
         {
           "element_type" : {
-            "type_ptr" : 103
+            "type_ptr" : 104
           },
           "stride" : 24
         },
@@ -1238,7 +1244,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 106
+          "pointer" : 107
         },
         {
           "type_ptr" : 8
@@ -1258,7 +1264,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 107
+          "pointer" : 108
         },
         {
           "return_type" : {
@@ -1291,7 +1297,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 108
+          "pointer" : 109
         },
         {
           "return_type" : {
@@ -1325,7 +1331,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 109
+          "pointer" : 110
         },
         {
           "base_type" : 92
@@ -1333,32 +1339,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 110
+          "pointer" : 111
         },
         {
-          "type_ptr" : 109
+          "type_ptr" : 110
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 111,
-          "desugared_type" : 110
+          "pointer" : 112,
+          "desugared_type" : 111
         },
         {
           "child_type" : {
-            "type_ptr" : 110
+            "type_ptr" : 111
           },
-          "decl_ptr" : 112
+          "decl_ptr" : 113
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 32,
-          "desugared_type" : 110
+          "desugared_type" : 111
         },
         {
           "child_type" : {
-            "type_ptr" : 111
+            "type_ptr" : 112
           },
           "decl_ptr" : 31
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_attributes.c.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_attributes.c.exp
index 1e9df569f..34276762e 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_attributes.c.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_attributes.c.exp
@@ -598,15 +598,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 76
         },
-        77
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 77
+        },
+        78
       )>,
       <"PointerType" : (
         {
-          "pointer" : 78
+          "pointer" : 79
         },
         {
           "type_ptr" : 11,
@@ -615,7 +621,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 79
+          "pointer" : 80
         },
         {
           "type_ptr" : 16,
@@ -624,7 +630,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 80
+          "pointer" : 81
         },
         {
           "type_ptr" : 16
@@ -632,17 +638,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 81
+          "pointer" : 82
         },
-        82
+        83
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 83
+          "pointer" : 84
         },
         {
           "element_type" : {
-            "type_ptr" : 81
+            "type_ptr" : 82
           },
           "stride" : 24
         },
@@ -667,7 +673,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
           "base_type" : 70
@@ -675,32 +681,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 85
+          "pointer" : 86
         },
         {
-          "type_ptr" : 84
+          "type_ptr" : 85
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 86,
-          "desugared_type" : 85
+          "pointer" : 87,
+          "desugared_type" : 86
         },
         {
           "child_type" : {
-            "type_ptr" : 85
+            "type_ptr" : 86
           },
-          "decl_ptr" : 87
+          "decl_ptr" : 88
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 13,
-          "desugared_type" : 85
+          "desugared_type" : 86
         },
         {
           "child_type" : {
-            "type_ptr" : 86
+            "type_ptr" : 87
           },
           "decl_ptr" : 12
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_cast.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_cast.cpp.exp
index 0f2c91337..051519e89 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_cast.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_cast.cpp.exp
@@ -871,15 +871,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 86
         },
-        87
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 87
+        },
+        88
       )>,
       <"PointerType" : (
         {
-          "pointer" : 88
+          "pointer" : 89
         },
         {
           "type_ptr" : 8,
@@ -888,7 +894,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
           "type_ptr" : 25,
@@ -897,7 +903,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "type_ptr" : 25
@@ -905,17 +911,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 91
+          "pointer" : 92
         },
-        92
+        93
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 93
+          "pointer" : 94
         },
         {
           "element_type" : {
-            "type_ptr" : 91
+            "type_ptr" : 92
           },
           "stride" : 24
         },
@@ -923,7 +929,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 94
+          "pointer" : 95
         },
         {
           "base_type" : 80
@@ -931,32 +937,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 95
+          "pointer" : 96
         },
         {
-          "type_ptr" : 94
+          "type_ptr" : 95
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 96,
-          "desugared_type" : 95
+          "pointer" : 97,
+          "desugared_type" : 96
         },
         {
           "child_type" : {
-            "type_ptr" : 95
+            "type_ptr" : 96
           },
-          "decl_ptr" : 97
+          "decl_ptr" : 98
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 22,
-          "desugared_type" : 95
+          "desugared_type" : 96
         },
         {
           "child_type" : {
-            "type_ptr" : 96
+            "type_ptr" : 97
           },
           "decl_ptr" : 21
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/class_template.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/class_template.cpp.exp
index 3ef6396ea..ed2897477 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/class_template.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/class_template.cpp.exp
@@ -279,7 +279,7 @@
                       "type_ptr" : 15
                     },
                     {
-                      "mangled_name" : "7066629788491464130",
+                      "mangled_name" : "5073671504388348295",
                       "is_cpp" : true,
                       "is_inline" : true,
                       "decl_ptr_with_body" : 14,
@@ -393,7 +393,7 @@
                       "type_ptr" : 20
                     },
                     {
-                      "mangled_name" : "11949468677960817094",
+                      "mangled_name" : "8283222246682784723",
                       "is_cpp" : true,
                       "is_inline" : true,
                       "parameters" : [
@@ -455,7 +455,7 @@
                       "type_ptr" : 24
                     },
                     {
-                      "mangled_name" : "14813278630171558444",
+                      "mangled_name" : "6839343167991811455",
                       "is_cpp" : true,
                       "is_inline" : true,
                       "parameters" : [
@@ -501,7 +501,7 @@
                 {
                   "is_pod" : true
                 },
-                "15160212752071097404",
+                "",
                 {
                   "template_decl" : 8,
                   "specialization_args" : [
@@ -615,7 +615,7 @@
           },
           {
           },
-          "15216485236755079891",
+          "",
           {
             "template_decl" : 8,
             "specialization_args" : [
@@ -745,7 +745,7 @@
                 "type_ptr" : 15
               },
               {
-                "mangled_name" : "13141222913637319333",
+                "mangled_name" : "12645234317802235044",
                 "is_cpp" : true,
                 "is_inline" : true,
                 "decl_ptr_with_body" : 18,
@@ -795,7 +795,7 @@
                 "type_ptr" : 41
               },
               {
-                "mangled_name" : "16063732695960137765",
+                "mangled_name" : "14822900838502915635",
                 "is_cpp" : true,
                 "is_inline" : true
               },
@@ -829,7 +829,7 @@
                 "type_ptr" : 43
               },
               {
-                "mangled_name" : "16241844907223898831",
+                "mangled_name" : "8232226518557505494",
                 "is_cpp" : true,
                 "is_inline" : true,
                 "parameters" : [
@@ -891,7 +891,7 @@
                 "type_ptr" : 47
               },
               {
-                "mangled_name" : "6117498947183732003",
+                "mangled_name" : "10012197224398183680",
                 "is_cpp" : true,
                 "is_inline" : true,
                 "parameters" : [
@@ -1357,7 +1357,7 @@
               }
             }
           },
-          "9300085993929073917",
+          "",
           {
             "template_decl" : 8,
             "specialization_args" : [
@@ -2221,15 +2221,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 149
         },
-        150
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 150
+        },
+        151
       )>,
       <"PointerType" : (
         {
-          "pointer" : 151
+          "pointer" : 152
         },
         {
           "type_ptr" : 38,
@@ -2238,7 +2244,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 152
+          "pointer" : 153
         },
         {
           "type_ptr" : 87,
@@ -2247,7 +2253,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 153
+          "pointer" : 154
         },
         {
           "type_ptr" : 87
@@ -2255,17 +2261,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 154
+          "pointer" : 155
         },
-        155
+        156
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 156
+          "pointer" : 157
         },
         {
           "element_type" : {
-            "type_ptr" : 154
+            "type_ptr" : 155
           },
           "stride" : 24
         },
@@ -2273,27 +2279,27 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 157
+          "pointer" : 158
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 158
+          "pointer" : 159
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 159
+          "pointer" : 160
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 160
+          "pointer" : 161
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 161
+          "pointer" : 162
         }
       )>,
       <"TemplateTypeParmType" : (
@@ -2306,12 +2312,12 @@
           "pointer" : 33
         },
         {
-          "type_ptr" : 157
+          "type_ptr" : 158
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 162
+          "pointer" : 163
         },
         {
           "type_ptr" : 32
@@ -2319,12 +2325,12 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 163
+          "pointer" : 164
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 164
+          "pointer" : 165
         }
       )>,
       <"InjectedClassNameType" : (
@@ -2334,7 +2340,7 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 165
+          "pointer" : 166
         }
       )>,
       <"RecordType" : (
@@ -2345,7 +2351,7 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 166,
+          "pointer" : 167,
           "desugared_type" : 35
         }
       )>,
@@ -2357,7 +2363,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 167
+          "pointer" : 168
         },
         {
           "return_type" : {
@@ -2391,7 +2397,7 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 168,
+          "pointer" : 169,
           "desugared_type" : 35
         }
       )>,
@@ -2405,10 +2411,10 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 169
+          "pointer" : 170
         },
         {
-          "type_ptr" : 168
+          "type_ptr" : 169
         }
       )>,
       <"RecordType" : (
@@ -2431,7 +2437,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 170
+          "pointer" : 171
         },
         {
           "type_ptr" : 13
@@ -2439,7 +2445,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 171
+          "pointer" : 172
         },
         {
           "return_type" : {
@@ -2451,7 +2457,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 172
+          "pointer" : 173
         },
         {
           "return_type" : {
@@ -2463,7 +2469,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 173
+          "pointer" : 174
         },
         {
           "return_type" : {
@@ -2505,7 +2511,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 174
+          "pointer" : 175
         },
         {
           "return_type" : {
@@ -2547,7 +2553,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 175
+          "pointer" : 176
         },
         {
           "return_type" : {
@@ -2581,7 +2587,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 176
+          "pointer" : 177
         },
         {
           "return_type" : {
@@ -2623,7 +2629,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 177
+          "pointer" : 178
         },
         {
           "return_type" : {
@@ -2669,7 +2675,7 @@
       )>,
       <"LValueReferenceType" : (
         {
-          "pointer" : 178
+          "pointer" : 179
         },
         {
           "type_ptr" : 35
@@ -2677,11 +2683,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 179
+          "pointer" : 180
         },
         {
           "return_type" : {
-            "type_ptr" : 178
+            "type_ptr" : 179
           }
         },
         {
@@ -2694,11 +2700,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 180
+          "pointer" : 181
         },
         {
           "return_type" : {
-            "type_ptr" : 178
+            "type_ptr" : 179
           }
         },
         {
@@ -2711,11 +2717,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 181
+          "pointer" : 182
         },
         {
           "return_type" : {
-            "type_ptr" : 178
+            "type_ptr" : 179
           }
         },
         {
@@ -2732,7 +2738,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 178
+            "type_ptr" : 179
           }
         },
         {
@@ -2749,7 +2755,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 178
+            "type_ptr" : 179
           }
         },
         {
@@ -2762,10 +2768,10 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 182
+          "pointer" : 183
         },
         {
-          "type_ptr" : 179
+          "type_ptr" : 180
         }
       )>,
       <"PointerType" : (
@@ -2778,7 +2784,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 183
+          "pointer" : 184
         },
         {
           "base_type" : 143
@@ -2786,32 +2792,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 184
+          "pointer" : 185
         },
         {
-          "type_ptr" : 183
+          "type_ptr" : 184
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 185,
-          "desugared_type" : 184
+          "pointer" : 186,
+          "desugared_type" : 185
         },
         {
           "child_type" : {
-            "type_ptr" : 184
+            "type_ptr" : 185
           },
-          "decl_ptr" : 186
+          "decl_ptr" : 187
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 84,
-          "desugared_type" : 184
+          "desugared_type" : 185
         },
         {
           "child_type" : {
-            "type_ptr" : 185
+            "type_ptr" : 186
           },
           "decl_ptr" : 83
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/comments.c.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/comments.c.exp
index 8cea7f13e..5fdc8f26a 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/comments.c.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/comments.c.exp
@@ -570,15 +570,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 75
         },
-        76
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 76
+        },
+        77
       )>,
       <"PointerType" : (
         {
-          "pointer" : 77
+          "pointer" : 78
         },
         {
           "type_ptr" : 17,
@@ -587,7 +593,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 78
+          "pointer" : 79
         },
         {
           "type_ptr" : 14,
@@ -596,7 +602,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 79
+          "pointer" : 80
         },
         {
           "type_ptr" : 14
@@ -604,17 +610,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 80
+          "pointer" : 81
         },
-        81
+        82
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 82
+          "pointer" : 83
         },
         {
           "element_type" : {
-            "type_ptr" : 80
+            "type_ptr" : 81
           },
           "stride" : 24
         },
@@ -632,7 +638,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 83
+          "pointer" : 84
         },
         {
           "base_type" : 69
@@ -640,32 +646,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
-          "type_ptr" : 83
+          "type_ptr" : 84
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 85,
-          "desugared_type" : 84
+          "pointer" : 86,
+          "desugared_type" : 85
         },
         {
           "child_type" : {
-            "type_ptr" : 84
+            "type_ptr" : 85
           },
-          "decl_ptr" : 86
+          "decl_ptr" : 87
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 11,
-          "desugared_type" : 84
+          "desugared_type" : 85
         },
         {
           "child_type" : {
-            "type_ptr" : 85
+            "type_ptr" : 86
           },
           "decl_ptr" : 10
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/const_cast.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/const_cast.cpp.exp
index 0bb01706e..cb4aa4cd2 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/const_cast.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/const_cast.cpp.exp
@@ -1082,15 +1082,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 96
         },
-        97
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 97
+        },
+        98
       )>,
       <"PointerType" : (
         {
-          "pointer" : 98
+          "pointer" : 99
         },
         {
           "type_ptr" : 30,
@@ -1099,7 +1105,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 99
+          "pointer" : 100
         },
         {
           "type_ptr" : 35,
@@ -1108,7 +1114,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 100
+          "pointer" : 101
         },
         {
           "type_ptr" : 35
@@ -1116,17 +1122,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 101
+          "pointer" : 102
         },
-        102
+        103
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 103
+          "pointer" : 104
         },
         {
           "element_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 102
           },
           "stride" : 24
         },
@@ -1140,7 +1146,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 104
+          "pointer" : 105
         },
         {
           "type_ptr" : 8
@@ -1194,7 +1200,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 105
+          "pointer" : 106
         },
         {
           "type_ptr" : 8,
@@ -1203,7 +1209,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 106
+          "pointer" : 107
         },
         {
           "base_type" : 90
@@ -1211,32 +1217,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 107
+          "pointer" : 108
         },
         {
-          "type_ptr" : 106
+          "type_ptr" : 107
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 108,
-          "desugared_type" : 107
+          "pointer" : 109,
+          "desugared_type" : 108
         },
         {
           "child_type" : {
-            "type_ptr" : 107
+            "type_ptr" : 108
           },
-          "decl_ptr" : 109
+          "decl_ptr" : 110
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 33,
-          "desugared_type" : 107
+          "desugared_type" : 108
         },
         {
           "child_type" : {
-            "type_ptr" : 108
+            "type_ptr" : 109
           },
           "decl_ptr" : 32
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/dynamic_cast.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/dynamic_cast.cpp.exp
index e3276a902..07fcb647b 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/dynamic_cast.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/dynamic_cast.cpp.exp
@@ -374,7 +374,7 @@
             "type_ptr" : 22
           },
           {
-            "mangled_name" : "5328378654181921475",
+            "mangled_name" : "6691652126532499765",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -409,7 +409,7 @@
             "type_ptr" : 24
           },
           {
-            "mangled_name" : "14779025497907219583",
+            "mangled_name" : "16649858826465904026",
             "is_cpp" : true,
             "is_inline" : true,
             "decl_ptr_with_body" : 23,
@@ -459,7 +459,7 @@
             "type_ptr" : 27
           },
           {
-            "mangled_name" : "3430056695640597274",
+            "mangled_name" : "6367731417382615745",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -520,7 +520,7 @@
             "type_ptr" : 30
           },
           {
-            "mangled_name" : "1361265890968139694",
+            "mangled_name" : "17956886967408801671",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -785,7 +785,7 @@
             "type_ptr" : 44
           },
           {
-            "mangled_name" : "7876366742276079110",
+            "mangled_name" : "6627935060446176348",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -820,7 +820,7 @@
             "type_ptr" : 24
           },
           {
-            "mangled_name" : "10798876524598897542",
+            "mangled_name" : "8928078380412315851",
             "is_cpp" : true,
             "is_inline" : true,
             "decl_ptr_with_body" : 45,
@@ -920,7 +920,7 @@
             "type_ptr" : 49
           },
           {
-            "mangled_name" : "7710293714478488613",
+            "mangled_name" : "6925252787601137710",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -981,7 +981,7 @@
             "type_ptr" : 52
           },
           {
-            "mangled_name" : "16903082029399050859",
+            "mangled_name" : "17350102287109130674",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -3510,15 +3510,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 176
         },
-        177
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 177
+        },
+        178
       )>,
       <"PointerType" : (
         {
-          "pointer" : 178
+          "pointer" : 179
         },
         {
           "type_ptr" : 116,
@@ -3527,7 +3533,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 179
+          "pointer" : 180
         },
         {
           "type_ptr" : 113,
@@ -3536,7 +3542,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 180
+          "pointer" : 181
         },
         {
           "type_ptr" : 113
@@ -3544,17 +3550,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 181
+          "pointer" : 182
         },
-        182
+        183
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 183
+          "pointer" : 184
         },
         {
           "element_type" : {
-            "type_ptr" : 181
+            "type_ptr" : 182
           },
           "stride" : 24
         },
@@ -3605,7 +3611,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 184
+          "pointer" : 185
         },
         {
           "return_type" : {
@@ -3647,7 +3653,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 185
+          "pointer" : 186
         },
         {
           "return_type" : {
@@ -3716,7 +3722,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 186
+          "pointer" : 187
         },
         {
           "return_type" : {
@@ -3758,7 +3764,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 187
+          "pointer" : 188
         },
         {
           "return_type" : {
@@ -3810,7 +3816,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 188
+          "pointer" : 189
         },
         {
           "return_type" : {
@@ -3822,7 +3828,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 189
+          "pointer" : 190
         },
         {
           "return_type" : {
@@ -3856,7 +3862,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 190
+          "pointer" : 191
         },
         {
           "return_type" : {
@@ -3902,7 +3908,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 191
+          "pointer" : 192
         },
         {
           "return_type" : {
@@ -3914,7 +3920,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 192
+          "pointer" : 193
         },
         {
           "return_type" : {
@@ -3948,7 +3954,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 193
+          "pointer" : 194
         },
         {
           "return_type" : {
@@ -4006,7 +4012,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 194
+          "pointer" : 195
         },
         {
           "base_type" : 170
@@ -4014,32 +4020,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 195
+          "pointer" : 196
         },
         {
-          "type_ptr" : 194
+          "type_ptr" : 195
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 196,
-          "desugared_type" : 195
+          "pointer" : 197,
+          "desugared_type" : 196
         },
         {
           "child_type" : {
-            "type_ptr" : 195
+            "type_ptr" : 196
           },
-          "decl_ptr" : 197
+          "decl_ptr" : 198
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 110,
-          "desugared_type" : 195
+          "desugared_type" : 196
         },
         {
           "child_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           },
           "decl_ptr" : 109
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/expr_with_cleanups.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/expr_with_cleanups.cpp.exp
index c07595a23..81c5c5979 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/expr_with_cleanups.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/expr_with_cleanups.cpp.exp
@@ -218,7 +218,7 @@
             "type_ptr" : 12
           },
           {
-            "mangled_name" : "4951616904021883133",
+            "mangled_name" : "5585539233588788972",
             "is_cpp" : true,
             "parameters" : [
               <"ParmVarDecl" : (
@@ -279,7 +279,7 @@
             "type_ptr" : 16
           },
           {
-            "mangled_name" : "11474741413113936247",
+            "mangled_name" : "7390596848467712836",
             "is_cpp" : true,
             "parameters" : [
               <"ParmVarDecl" : (
@@ -401,7 +401,7 @@
             "type_ptr" : 23
           },
           {
-            "mangled_name" : "9850251229546392500",
+            "mangled_name" : "10975959821506117086",
             "is_cpp" : true
           },
           {
@@ -535,7 +535,7 @@
             "type_ptr" : 12
           },
           {
-            "mangled_name" : "14898886720565199942",
+            "mangled_name" : "16769418782937754571",
             "is_cpp" : true,
             "parameters" : [
               <"ParmVarDecl" : (
@@ -596,7 +596,7 @@
             "type_ptr" : 23
           },
           {
-            "mangled_name" : "11799330211249239787",
+            "mangled_name" : "13039880593729639901",
             "is_cpp" : true
           },
           {
@@ -631,7 +631,7 @@
             "type_ptr" : 32
           },
           {
-            "mangled_name" : "7125450473324676530",
+            "mangled_name" : "18119742553314115417",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -3706,15 +3706,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 177
         },
-        178
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 178
+        },
+        179
       )>,
       <"PointerType" : (
         {
-          "pointer" : 179
+          "pointer" : 180
         },
         {
           "type_ptr" : 14,
@@ -3723,7 +3729,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 180
+          "pointer" : 181
         },
         {
           "type_ptr" : 115,
@@ -3732,7 +3738,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 181
+          "pointer" : 182
         },
         {
           "type_ptr" : 115
@@ -3740,17 +3746,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 182
+          "pointer" : 183
         },
-        183
+        184
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 184
+          "pointer" : 185
         },
         {
           "element_type" : {
-            "type_ptr" : 182
+            "type_ptr" : 183
           },
           "stride" : 24
         },
@@ -3764,7 +3770,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 185
+          "pointer" : 186
         },
         {
           "type_ptr" : 8
@@ -3815,7 +3821,7 @@
       )>,
       <"LValueReferenceType" : (
         {
-          "pointer" : 186
+          "pointer" : 187
         },
         {
           "type_ptr" : 8
@@ -3827,7 +3833,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 186
+            "type_ptr" : 187
           }
         },
         {
@@ -3852,7 +3858,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 187
+          "pointer" : 188
         },
         {
           "return_type" : {
@@ -3870,7 +3876,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 188
+          "pointer" : 189
         },
         {
           "type_ptr" : 25
@@ -3878,7 +3884,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 189
+          "pointer" : 190
         },
         {
           "return_type" : {
@@ -3953,7 +3959,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 190
+          "pointer" : 191
         },
         {
           "return_type" : {
@@ -3970,7 +3976,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 191
+          "pointer" : 192
         },
         {
           "return_type" : {
@@ -4020,7 +4026,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 192
+          "pointer" : 193
         },
         {
           "base_type" : 171
@@ -4028,32 +4034,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 193
+          "pointer" : 194
         },
         {
-          "type_ptr" : 192
+          "type_ptr" : 193
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 194,
-          "desugared_type" : 193
+          "pointer" : 195,
+          "desugared_type" : 194
         },
         {
           "child_type" : {
-            "type_ptr" : 193
+            "type_ptr" : 194
           },
-          "decl_ptr" : 195
+          "decl_ptr" : 196
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 112,
-          "desugared_type" : 193
+          "desugared_type" : 194
         },
         {
           "child_type" : {
-            "type_ptr" : 194
+            "type_ptr" : 195
           },
           "decl_ptr" : 111
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/friend.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/friend.cpp.exp
index 132381c3a..bd9e92554 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/friend.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/friend.cpp.exp
@@ -169,7 +169,7 @@
             },
             {
             },
-            "8348715085918813141",
+            "",
             {
               "template_decl" : 7,
               "specialization_args" : [
@@ -347,7 +347,7 @@
                   "type_ptr" : 20
                 },
                 {
-                  "mangled_name" : "17039860285578718334",
+                  "mangled_name" : "15291750046890212067",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 19,
@@ -397,7 +397,7 @@
                   "type_ptr" : 23
                 },
                 {
-                  "mangled_name" : "10269173081916450237",
+                  "mangled_name" : "225939024662492936",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -458,7 +458,7 @@
                   "type_ptr" : 27
                 },
                 {
-                  "mangled_name" : "15856009432989426751",
+                  "mangled_name" : "11375010590039767716",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -504,7 +504,7 @@
             {
               "is_pod" : true
             },
-            "12207844931495093295",
+            "",
             {
               "template_decl" : 11,
               "specialization_args" : [
@@ -1002,15 +1002,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 100
         },
-        101
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 101
+        },
+        102
       )>,
       <"PointerType" : (
         {
-          "pointer" : 102
+          "pointer" : 103
         },
         {
           "type_ptr" : 30,
@@ -1019,7 +1025,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 103
+          "pointer" : 104
         },
         {
           "type_ptr" : 38,
@@ -1028,7 +1034,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 104
+          "pointer" : 105
         },
         {
           "type_ptr" : 38
@@ -1036,17 +1042,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 105
+          "pointer" : 106
         },
-        106
+        107
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 107
+          "pointer" : 108
         },
         {
           "element_type" : {
-            "type_ptr" : 105
+            "type_ptr" : 106
           },
           "stride" : 24
         },
@@ -1054,104 +1060,104 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 108
+          "pointer" : 109
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 109
+          "pointer" : 110
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 110
+          "pointer" : 111
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 111
+          "pointer" : 112
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 112
+          "pointer" : 113
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 113
+          "pointer" : 114
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 114
+          "pointer" : 115
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 115
+          "pointer" : 116
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 116
+          "pointer" : 117
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 117
+          "pointer" : 118
         },
         {
-          "type_ptr" : 108
+          "type_ptr" : 109
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 118
+          "pointer" : 119
         },
         {
-          "type_ptr" : 113
+          "type_ptr" : 114
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 119
+          "pointer" : 120
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 120
+          "pointer" : 121
         }
       )>,
       <"ElaboratedType" : (
         {
-          "pointer" : 121,
-          "desugared_type" : 120
+          "pointer" : 122,
+          "desugared_type" : 121
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 122
+          "pointer" : 123
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 123
+          "pointer" : 124
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 124
+          "pointer" : 125
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 125
+          "pointer" : 126
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 126
+          "pointer" : 127
         }
       )>,
       <"RecordType" : (
@@ -1168,7 +1174,7 @@
       )>,
       <"SubstTemplateTypeParmType" : (
         {
-          "pointer" : 127,
+          "pointer" : 128,
           "desugared_type" : 30
         }
       )>,
@@ -1182,10 +1188,10 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 128
+          "pointer" : 129
         },
         {
-          "type_ptr" : 127
+          "type_ptr" : 128
         }
       )>,
       <"RecordType" : (
@@ -1196,7 +1202,7 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 129,
+          "pointer" : 130,
           "desugared_type" : 9
         }
       )>,
@@ -1208,12 +1214,12 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 130
+          "pointer" : 131
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 131
+          "pointer" : 132
         },
         {
           "return_type" : {
@@ -1225,7 +1231,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 132
+          "pointer" : 133
         },
         {
           "return_type" : {
@@ -1246,7 +1252,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 133
+          "pointer" : 134
         },
         {
           "return_type" : {
@@ -1288,7 +1294,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 134
+          "pointer" : 135
         },
         {
           "return_type" : {
@@ -1334,7 +1340,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 135
+          "pointer" : 136
         },
         {
           "base_type" : 94
@@ -1342,32 +1348,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 136
+          "pointer" : 137
         },
         {
-          "type_ptr" : 135
+          "type_ptr" : 136
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 137,
-          "desugared_type" : 136
+          "pointer" : 138,
+          "desugared_type" : 137
         },
         {
           "child_type" : {
-            "type_ptr" : 136
+            "type_ptr" : 137
           },
-          "decl_ptr" : 138
+          "decl_ptr" : 139
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 35,
-          "desugared_type" : 136
+          "desugared_type" : 137
         },
         {
           "child_type" : {
-            "type_ptr" : 137
+            "type_ptr" : 138
           },
           "decl_ptr" : 34
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/function_template.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/function_template.cpp.exp
index b473f547c..a78bf76bc 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/function_template.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/function_template.cpp.exp
@@ -1815,15 +1815,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 131
         },
-        132
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 132
+        },
+        133
       )>,
       <"PointerType" : (
         {
-          "pointer" : 133
+          "pointer" : 134
         },
         {
           "type_ptr" : 38,
@@ -1832,7 +1838,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 134
+          "pointer" : 135
         },
         {
           "type_ptr" : 25,
@@ -1841,7 +1847,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 135
+          "pointer" : 136
         },
         {
           "type_ptr" : 25
@@ -1849,17 +1855,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 136
+          "pointer" : 137
         },
-        137
+        138
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 138
+          "pointer" : 139
         },
         {
           "element_type" : {
-            "type_ptr" : 136
+            "type_ptr" : 137
           },
           "stride" : 24
         },
@@ -1867,44 +1873,44 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 139
+          "pointer" : 140
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 140
+          "pointer" : 141
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 141
+          "pointer" : 142
         },
         {
           "return_type" : {
-            "type_ptr" : 139
+            "type_ptr" : 140
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 139
+              "type_ptr" : 140
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 142
+          "pointer" : 143
         },
         {
           "return_type" : {
-            "type_ptr" : 140
+            "type_ptr" : 141
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 140
+              "type_ptr" : 141
             }
           ]
         }
@@ -1928,30 +1934,30 @@
       )>,
       <"SubstTemplateTypeParmType" : (
         {
-          "pointer" : 143,
+          "pointer" : 144,
           "desugared_type" : 38
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 144
+          "pointer" : 145
         },
         {
           "return_type" : {
-            "type_ptr" : 143
+            "type_ptr" : 144
           }
         },
         {
           "params_type" : [
             {
-              "type_ptr" : 143
+              "type_ptr" : 144
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 145
+          "pointer" : 146
         },
         {
           "return_type" : {
@@ -2009,7 +2015,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 146
+          "pointer" : 147
         },
         {
           "return_type" : {
@@ -2043,10 +2049,10 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 147
+          "pointer" : 148
         },
         {
-          "type_ptr" : 146
+          "type_ptr" : 147
         }
       )>,
       <"PointerType" : (
@@ -2065,7 +2071,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 148
+          "pointer" : 149
         },
         {
           "return_type" : {
@@ -2099,10 +2105,10 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 149
+          "pointer" : 150
         },
         {
-          "type_ptr" : 148
+          "type_ptr" : 149
         }
       )>,
       <"PointerType" : (
@@ -2115,7 +2121,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 150
+          "pointer" : 151
         },
         {
           "base_type" : 125
@@ -2123,32 +2129,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 151
+          "pointer" : 152
         },
         {
-          "type_ptr" : 150
+          "type_ptr" : 151
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 152,
-          "desugared_type" : 151
+          "pointer" : 153,
+          "desugared_type" : 152
         },
         {
           "child_type" : {
-            "type_ptr" : 151
+            "type_ptr" : 152
           },
-          "decl_ptr" : 153
+          "decl_ptr" : 154
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 69,
-          "desugared_type" : 151
+          "desugared_type" : 152
         },
         {
           "child_type" : {
-            "type_ptr" : 152
+            "type_ptr" : 153
           },
           "decl_ptr" : 68
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/generic_selector_expression.c.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/generic_selector_expression.c.exp
index dc07f2f06..2189f5031 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/generic_selector_expression.c.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/generic_selector_expression.c.exp
@@ -1835,15 +1835,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 106
         },
-        107
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 107
+        },
+        108
       )>,
       <"PointerType" : (
         {
-          "pointer" : 108
+          "pointer" : 109
         },
         {
           "type_ptr" : 15,
@@ -1852,7 +1858,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 109
+          "pointer" : 110
         },
         {
           "type_ptr" : 12,
@@ -1861,7 +1867,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 110
+          "pointer" : 111
         },
         {
           "type_ptr" : 12
@@ -1869,17 +1875,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 111
+          "pointer" : 112
         },
-        112
+        113
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 113
+          "pointer" : 114
         },
         {
           "element_type" : {
-            "type_ptr" : 111
+            "type_ptr" : 112
           },
           "stride" : 24
         },
@@ -1899,7 +1905,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 114
+          "pointer" : 115
         },
         {
           "base_type" : 100
@@ -1907,32 +1913,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 115
+          "pointer" : 116
         },
         {
-          "type_ptr" : 114
+          "type_ptr" : 115
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 116,
-          "desugared_type" : 115
+          "pointer" : 117,
+          "desugared_type" : 116
         },
         {
           "child_type" : {
-            "type_ptr" : 115
+            "type_ptr" : 116
           },
-          "decl_ptr" : 117
+          "decl_ptr" : 118
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 44,
-          "desugared_type" : 115
+          "desugared_type" : 116
         },
         {
           "child_type" : {
-            "type_ptr" : 116
+            "type_ptr" : 117
           },
           "decl_ptr" : 43
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheritance.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheritance.cpp.exp
index 7fc516db3..e8fea77b3 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheritance.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheritance.cpp.exp
@@ -981,7 +981,7 @@
             "type_ptr" : 52
           },
           {
-            "mangled_name" : "7469005664164565375",
+            "mangled_name" : "8602613147659843985",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -2577,7 +2577,7 @@
             "type_ptr" : 125
           },
           {
-            "mangled_name" : "4580501627556196443",
+            "mangled_name" : "5821333485013418573",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -3035,15 +3035,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 188
         },
-        189
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 189
+        },
+        190
       )>,
       <"PointerType" : (
         {
-          "pointer" : 190
+          "pointer" : 191
         },
         {
           "type_ptr" : 22,
@@ -3052,7 +3058,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 191
+          "pointer" : 192
         },
         {
           "type_ptr" : 128,
@@ -3061,7 +3067,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 192
+          "pointer" : 193
         },
         {
           "type_ptr" : 128
@@ -3069,17 +3075,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 193
+          "pointer" : 194
         },
-        194
+        195
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 195
+          "pointer" : 196
         },
         {
           "element_type" : {
-            "type_ptr" : 193
+            "type_ptr" : 194
           },
           "stride" : 24
         },
@@ -3179,7 +3185,7 @@
       )>,
       <"LValueReferenceType" : (
         {
-          "pointer" : 196
+          "pointer" : 197
         },
         {
           "type_ptr" : 16
@@ -3196,11 +3202,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 197
+          "pointer" : 198
         },
         {
           "return_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           }
         },
         {
@@ -3217,7 +3223,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           }
         },
         {
@@ -3238,11 +3244,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 198
+          "pointer" : 199
         },
         {
           "return_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           }
         },
         {
@@ -3259,7 +3265,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           }
         },
         {
@@ -3310,7 +3316,7 @@
       )>,
       <"LValueReferenceType" : (
         {
-          "pointer" : 199
+          "pointer" : 200
         },
         {
           "type_ptr" : 54
@@ -3327,11 +3333,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 200
+          "pointer" : 201
         },
         {
           "return_type" : {
-            "type_ptr" : 199
+            "type_ptr" : 200
           }
         },
         {
@@ -3348,7 +3354,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 199
+            "type_ptr" : 200
           }
         },
         {
@@ -3369,11 +3375,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 201
+          "pointer" : 202
         },
         {
           "return_type" : {
-            "type_ptr" : 199
+            "type_ptr" : 200
           }
         },
         {
@@ -3390,7 +3396,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 199
+            "type_ptr" : 200
           }
         },
         {
@@ -3431,7 +3437,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 202
+          "pointer" : 203
         },
         {
           "base_type" : 182
@@ -3439,32 +3445,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 203
+          "pointer" : 204
         },
         {
-          "type_ptr" : 202
+          "type_ptr" : 203
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 204,
-          "desugared_type" : 203
+          "pointer" : 205,
+          "desugared_type" : 204
         },
         {
           "child_type" : {
-            "type_ptr" : 203
+            "type_ptr" : 204
           },
-          "decl_ptr" : 205
+          "decl_ptr" : 206
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 127,
-          "desugared_type" : 203
+          "desugared_type" : 204
         },
         {
           "child_type" : {
-            "type_ptr" : 204
+            "type_ptr" : 205
           },
           "decl_ptr" : 126
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheriting_constructor.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheriting_constructor.cpp.exp
index fd9b06840..c54eafe02 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheriting_constructor.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheriting_constructor.cpp.exp
@@ -203,7 +203,7 @@
             "type_ptr" : 11
           },
           {
-            "mangled_name" : "14779048587651412014",
+            "mangled_name" : "16649826940628685907",
             "is_cpp" : true,
             "parameters" : [
               <"ParmVarDecl" : (
@@ -327,7 +327,7 @@
             "type_ptr" : 19
           },
           {
-            "mangled_name" : "3430056695640597274",
+            "mangled_name" : "6367731417382615745",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -388,7 +388,7 @@
             "type_ptr" : 23
           },
           {
-            "mangled_name" : "1361265890968139694",
+            "mangled_name" : "17956886967408801671",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -449,7 +449,7 @@
             "type_ptr" : 27
           },
           {
-            "mangled_name" : "5328378654181921475",
+            "mangled_name" : "6691652126532499765",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -655,7 +655,7 @@
             "type_ptr" : 36
           },
           {
-            "mangled_name" : "10798876524598897542",
+            "mangled_name" : "8928078380412315851",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -688,7 +688,7 @@
             "type_ptr" : 38
           },
           {
-            "mangled_name" : "7710293714478488613",
+            "mangled_name" : "6925252787601137710",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -749,7 +749,7 @@
             "type_ptr" : 42
           },
           {
-            "mangled_name" : "16903082029399050859",
+            "mangled_name" : "17350102287109130674",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -813,7 +813,7 @@
             "type_ptr" : 46
           },
           {
-            "mangled_name" : "18258347749069050656",
+            "mangled_name" : "5352909623164416057",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -1558,15 +1558,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 123
         },
-        124
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 124
+        },
+        125
       )>,
       <"PointerType" : (
         {
-          "pointer" : 125
+          "pointer" : 126
         },
         {
           "type_ptr" : 13,
@@ -1575,7 +1581,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 126
+          "pointer" : 127
         },
         {
           "type_ptr" : 61,
@@ -1584,7 +1590,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 127
+          "pointer" : 128
         },
         {
           "type_ptr" : 61
@@ -1592,17 +1598,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 128
+          "pointer" : 129
         },
-        129
+        130
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 130
+          "pointer" : 131
         },
         {
           "element_type" : {
-            "type_ptr" : 128
+            "type_ptr" : 129
           },
           "stride" : 24
         },
@@ -1616,7 +1622,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 131
+          "pointer" : 132
         },
         {
           "type_ptr" : 8
@@ -1668,7 +1674,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 132
+          "pointer" : 133
         },
         {
           "return_type" : {
@@ -1710,7 +1716,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 133
+          "pointer" : 134
         },
         {
           "return_type" : {
@@ -1765,7 +1771,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 134
+          "pointer" : 135
         },
         {
           "return_type" : {
@@ -1819,7 +1825,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 135
+          "pointer" : 136
         },
         {
           "return_type" : {
@@ -1865,15 +1871,15 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 136
+          "pointer" : 137
         },
         {
-          "type_ptr" : 127
+          "type_ptr" : 128
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 137
+          "pointer" : 138
         },
         {
           "return_type" : {
@@ -1907,7 +1913,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 138
+          "pointer" : 139
         },
         {
           "base_type" : 117
@@ -1915,32 +1921,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 139
+          "pointer" : 140
         },
         {
-          "type_ptr" : 138
+          "type_ptr" : 139
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 140,
-          "desugared_type" : 139
+          "pointer" : 141,
+          "desugared_type" : 140
         },
         {
           "child_type" : {
-            "type_ptr" : 139
+            "type_ptr" : 140
           },
-          "decl_ptr" : 141
+          "decl_ptr" : 142
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 58,
-          "desugared_type" : 139
+          "desugared_type" : 140
         },
         {
           "child_type" : {
-            "type_ptr" : 140
+            "type_ptr" : 141
           },
           "decl_ptr" : 57
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/lambda.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/lambda.cpp.exp
index 07291afca..4207c0fa3 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/lambda.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/lambda.cpp.exp
@@ -564,7 +564,7 @@
                                         "type_ptr" : 31
                                       },
                                       {
-                                        "mangled_name" : "11922868141377072075",
+                                        "mangled_name" : "13286141613727650365",
                                         "is_cpp" : true,
                                         "is_inline" : true
                                       },
@@ -598,7 +598,7 @@
                                         "type_ptr" : 33
                                       },
                                       {
-                                        "mangled_name" : "11530695906998885266",
+                                        "mangled_name" : "10693628329110131385",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -662,7 +662,7 @@
                                         "type_ptr" : 37
                                       },
                                       {
-                                        "mangled_name" : "12828931072019093462",
+                                        "mangled_name" : "18362977156530360911",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -1148,7 +1148,7 @@
                                             "type_ptr" : 31
                                           },
                                           {
-                                            "mangled_name" : "11922868141377072075",
+                                            "mangled_name" : "13286141613727650365",
                                             "is_cpp" : true,
                                             "is_inline" : true
                                           },
@@ -1182,7 +1182,7 @@
                                             "type_ptr" : 33
                                           },
                                           {
-                                            "mangled_name" : "11530695906998885266",
+                                            "mangled_name" : "10693628329110131385",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -1246,7 +1246,7 @@
                                             "type_ptr" : 37
                                           },
                                           {
-                                            "mangled_name" : "12828931072019093462",
+                                            "mangled_name" : "18362977156530360911",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -1912,7 +1912,7 @@
                                         "type_ptr" : 31
                                       },
                                       {
-                                        "mangled_name" : "16202408192376244884",
+                                        "mangled_name" : "17450839874206147646",
                                         "is_cpp" : true,
                                         "is_inline" : true
                                       },
@@ -1946,7 +1946,7 @@
                                         "type_ptr" : 65
                                       },
                                       {
-                                        "mangled_name" : "9965911517403679447",
+                                        "mangled_name" : "34143097794571044",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -2010,7 +2010,7 @@
                                         "type_ptr" : 69
                                       },
                                       {
-                                        "mangled_name" : "8193408137476215445",
+                                        "mangled_name" : "4775778177696808400",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -3039,7 +3039,7 @@
                                             "type_ptr" : 31
                                           },
                                           {
-                                            "mangled_name" : "16202408192376244884",
+                                            "mangled_name" : "17450839874206147646",
                                             "is_cpp" : true,
                                             "is_inline" : true
                                           },
@@ -3073,7 +3073,7 @@
                                             "type_ptr" : 65
                                           },
                                           {
-                                            "mangled_name" : "9965911517403679447",
+                                            "mangled_name" : "34143097794571044",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -3137,7 +3137,7 @@
                                             "type_ptr" : 69
                                           },
                                           {
-                                            "mangled_name" : "8193408137476215445",
+                                            "mangled_name" : "4775778177696808400",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -4033,7 +4033,7 @@
                                         "type_ptr" : 31
                                       },
                                       {
-                                        "mangled_name" : "17098733838812833493",
+                                        "mangled_name" : "15857901981355611363",
                                         "is_cpp" : true,
                                         "is_inline" : true
                                       },
@@ -4067,7 +4067,7 @@
                                         "type_ptr" : 100
                                       },
                                       {
-                                        "mangled_name" : "14201972727608021968",
+                                        "mangled_name" : "7938324828555278899",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -4131,7 +4131,7 @@
                                         "type_ptr" : 104
                                       },
                                       {
-                                        "mangled_name" : "3001717133787422796",
+                                        "mangled_name" : "4960955440766632321",
                                         "is_cpp" : true,
                                         "is_inline" : true,
                                         "parameters" : [
@@ -4921,7 +4921,7 @@
                                             "type_ptr" : 31
                                           },
                                           {
-                                            "mangled_name" : "17098733838812833493",
+                                            "mangled_name" : "15857901981355611363",
                                             "is_cpp" : true,
                                             "is_inline" : true
                                           },
@@ -4955,7 +4955,7 @@
                                             "type_ptr" : 100
                                           },
                                           {
-                                            "mangled_name" : "14201972727608021968",
+                                            "mangled_name" : "7938324828555278899",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -5019,7 +5019,7 @@
                                             "type_ptr" : 104
                                           },
                                           {
-                                            "mangled_name" : "3001717133787422796",
+                                            "mangled_name" : "4960955440766632321",
                                             "is_cpp" : true,
                                             "is_inline" : true,
                                             "parameters" : [
@@ -5874,15 +5874,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 182
         },
-        183
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 183
+        },
+        184
       )>,
       <"PointerType" : (
         {
-          "pointer" : 184
+          "pointer" : 185
         },
         {
           "type_ptr" : 12,
@@ -5891,7 +5897,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 185
+          "pointer" : 186
         },
         {
           "type_ptr" : 120,
@@ -5900,7 +5906,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 186
+          "pointer" : 187
         },
         {
           "type_ptr" : 120
@@ -5908,17 +5914,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 187
+          "pointer" : 188
         },
-        188
+        189
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 189
+          "pointer" : 190
         },
         {
           "element_type" : {
-            "type_ptr" : 187
+            "type_ptr" : 188
           },
           "stride" : 24
         },
@@ -5938,19 +5944,19 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 190
+          "pointer" : 191
         },
         {
-          "type_ptr" : 186
+          "type_ptr" : 187
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 191
+          "pointer" : 192
         },
         {
           "return_type" : {
-            "type_ptr" : 192
+            "type_ptr" : 193
           }
         },
         {
@@ -5964,12 +5970,12 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 193
+          "pointer" : 194
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 194
+          "pointer" : 195
         }
       )>,
       <"AutoType" : (
@@ -5980,7 +5986,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 195
+          "pointer" : 196
         },
         {
           "return_type" : {
@@ -6016,7 +6022,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 196
+          "pointer" : 197
         },
         {
           "type_ptr" : 8
@@ -6024,7 +6030,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 197
+          "pointer" : 198
         },
         {
           "type_ptr" : 29
@@ -6032,11 +6038,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 198
+          "pointer" : 199
         },
         {
           "return_type" : {
-            "type_ptr" : 196
+            "type_ptr" : 197
           }
         },
         {
@@ -6048,7 +6054,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 197
+            "type_ptr" : 198
           }
         },
         {
@@ -6056,7 +6062,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 199
+          "pointer" : 200
         },
         {
           "return_type" : {
@@ -6068,7 +6074,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 200
+          "pointer" : 201
         },
         {
           "return_type" : {
@@ -6092,7 +6098,7 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 201
+          "pointer" : 202
         }
       )>,
       <"AutoType" : (
@@ -6112,7 +6118,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 202
+          "pointer" : 203
         },
         {
           "return_type" : {
@@ -6154,7 +6160,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 203
+          "pointer" : 204
         },
         {
           "return_type" : {
@@ -6171,7 +6177,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 204
+          "pointer" : 205
         },
         {
           "return_type" : {
@@ -6205,11 +6211,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 205
+          "pointer" : 206
         },
         {
           "return_type" : {
-            "type_ptr" : 192
+            "type_ptr" : 193
           }
         },
         {
@@ -6236,12 +6242,12 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 206
+          "pointer" : 207
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 207
+          "pointer" : 208
         },
         {
           "return_type" : {
@@ -6275,7 +6281,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 208
+          "pointer" : 209
         },
         {
           "return_type" : {
@@ -6287,7 +6293,7 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 209
+          "pointer" : 210
         }
       )>,
       <"AutoType" : (
@@ -6307,7 +6313,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 210
+          "pointer" : 211
         },
         {
           "return_type" : {
@@ -6349,7 +6355,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 211
+          "pointer" : 212
         },
         {
           "return_type" : {
@@ -6366,7 +6372,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 212
+          "pointer" : 213
         },
         {
           "return_type" : {
@@ -6400,7 +6406,7 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 213
+          "pointer" : 214
         }
       )>,
       <"RecordType" : (
@@ -6411,12 +6417,12 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 214
+          "pointer" : 215
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 215
+          "pointer" : 216
         },
         {
           "return_type" : {
@@ -6428,7 +6434,7 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 216
+          "pointer" : 217
         }
       )>,
       <"AutoType" : (
@@ -6448,7 +6454,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 217
+          "pointer" : 218
         },
         {
           "return_type" : {
@@ -6490,7 +6496,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 218
+          "pointer" : 219
         },
         {
           "return_type" : {
@@ -6507,7 +6513,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 219
+          "pointer" : 220
         },
         {
           "return_type" : {
@@ -6541,7 +6547,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 220
+          "pointer" : 221
         },
         {
           "base_type" : 176
@@ -6549,32 +6555,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 221
+          "pointer" : 222
         },
         {
-          "type_ptr" : 220
+          "type_ptr" : 221
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 222,
-          "desugared_type" : 221
+          "pointer" : 223,
+          "desugared_type" : 222
         },
         {
           "child_type" : {
-            "type_ptr" : 221
+            "type_ptr" : 222
           },
-          "decl_ptr" : 223
+          "decl_ptr" : 224
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 117,
-          "desugared_type" : 221
+          "desugared_type" : 222
         },
         {
           "child_type" : {
-            "type_ptr" : 222
+            "type_ptr" : 223
           },
           "decl_ptr" : 116
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/materialize_temporary.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/materialize_temporary.cpp.exp
index 7a6e00c2b..082ea7f47 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/materialize_temporary.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/materialize_temporary.cpp.exp
@@ -673,15 +673,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 80
         },
-        81
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 81
+        },
+        82
       )>,
       <"PointerType" : (
         {
-          "pointer" : 82
+          "pointer" : 83
         },
         {
           "type_ptr" : 14,
@@ -690,7 +696,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 83
+          "pointer" : 84
         },
         {
           "type_ptr" : 19,
@@ -699,7 +705,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
           "type_ptr" : 19
@@ -707,17 +713,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 85
+          "pointer" : 86
         },
-        86
+        87
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 87
+          "pointer" : 88
         },
         {
           "element_type" : {
-            "type_ptr" : 85
+            "type_ptr" : 86
           },
           "stride" : 24
         },
@@ -734,7 +740,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 88
+          "pointer" : 89
         },
         {
           "base_type" : 74
@@ -742,32 +748,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
-          "type_ptr" : 88
+          "type_ptr" : 89
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 90,
-          "desugared_type" : 89
+          "pointer" : 91,
+          "desugared_type" : 90
         },
         {
           "child_type" : {
-            "type_ptr" : 89
+            "type_ptr" : 90
           },
-          "decl_ptr" : 91
+          "decl_ptr" : 92
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 16,
-          "desugared_type" : 89
+          "desugared_type" : 90
         },
         {
           "child_type" : {
-            "type_ptr" : 90
+            "type_ptr" : 91
           },
           "decl_ptr" : 15
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/namespace_decl.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/namespace_decl.cpp.exp
index 32bbdab9e..c70401592 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/namespace_decl.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/namespace_decl.cpp.exp
@@ -754,15 +754,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 81
         },
-        82
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 82
+        },
+        83
       )>,
       <"PointerType" : (
         {
-          "pointer" : 83
+          "pointer" : 84
         },
         {
           "type_ptr" : 12,
@@ -771,7 +777,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
           "type_ptr" : 19,
@@ -780,7 +786,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 85
+          "pointer" : 86
         },
         {
           "type_ptr" : 19
@@ -788,17 +794,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 86
+          "pointer" : 87
         },
-        87
+        88
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 88
+          "pointer" : 89
         },
         {
           "element_type" : {
-            "type_ptr" : 86
+            "type_ptr" : 87
           },
           "stride" : 24
         },
@@ -806,7 +812,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
           "base_type" : 75
@@ -814,32 +820,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
-          "type_ptr" : 89
+          "type_ptr" : 90
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 91,
-          "desugared_type" : 90
+          "pointer" : 92,
+          "desugared_type" : 91
         },
         {
           "child_type" : {
-            "type_ptr" : 90
+            "type_ptr" : 91
           },
-          "decl_ptr" : 92
+          "decl_ptr" : 93
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 16,
-          "desugared_type" : 90
+          "desugared_type" : 91
         },
         {
           "child_type" : {
-            "type_ptr" : 91
+            "type_ptr" : 92
           },
           "decl_ptr" : 15
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/new.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/new.cpp.exp
index 08f79c882..c35be42b0 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/new.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/new.cpp.exp
@@ -231,7 +231,7 @@
             "type_ptr" : 13
           },
           {
-            "mangled_name" : "8251339330154476193",
+            "mangled_name" : "7740115901201927888",
             "is_cpp" : true,
             "is_inline" : true,
             "decl_ptr_with_body" : 12,
@@ -280,7 +280,7 @@
             "type_ptr" : 16
           },
           {
-            "mangled_name" : "14628250159452892772",
+            "mangled_name" : "12480848167264656407",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -341,7 +341,7 @@
             "type_ptr" : 20
           },
           {
-            "mangled_name" : "3036348191925830672",
+            "mangled_name" : "6070336924810484949",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -403,7 +403,7 @@
             "type_ptr" : 13
           },
           {
-            "mangled_name" : "6606037711693769625",
+            "mangled_name" : "5472746887547415783",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -608,7 +608,7 @@
             "type_ptr" : 31
           },
           {
-            "mangled_name" : "1107470972604094108",
+            "mangled_name" : "1603213277834459133",
             "is_cpp" : true,
             "decl_ptr_with_body" : 30,
             "body" : <"CompoundStmt" : (
@@ -818,7 +818,7 @@
             "type_ptr" : 37
           },
           {
-            "mangled_name" : "4402068687990998056",
+            "mangled_name" : "5877806831249345467",
             "is_cpp" : true,
             "parameters" : [
               <"ParmVarDecl" : (
@@ -1155,7 +1155,7 @@
             "type_ptr" : 47
           },
           {
-            "mangled_name" : "17856063292060911243",
+            "mangled_name" : "17833126256375871848",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -1216,7 +1216,7 @@
             "type_ptr" : 51
           },
           {
-            "mangled_name" : "6680359559125245897",
+            "mangled_name" : "16041718976592305524",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -1278,7 +1278,7 @@
             "type_ptr" : 13
           },
           {
-            "mangled_name" : "10313252178728731272",
+            "mangled_name" : "11561666268372582658",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -3193,6 +3193,28 @@
               )
             },
             <"DefaultVisibility">
+          )>,
+          <"ReturnsNonNullAttr" : (
+            {
+              "pointer" : 121,
+              "source_range" : (
+                {
+                },
+                {
+                }
+              )
+            }
+          )>,
+          <"AllocSizeAttr" : (
+            {
+              "pointer" : 122,
+              "source_range" : (
+                {
+                },
+                {
+                }
+              )
+            }
           )>
         ]
       },
@@ -3203,7 +3225,7 @@
         ]
       },
       {
-        "type_ptr" : 121
+        "type_ptr" : 123
       },
       {
         "mangled_name" : "5103882463850428890",
@@ -3211,7 +3233,7 @@
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 122,
+              "pointer" : 124,
               "source_range" : (
                 {
                 },
@@ -3238,7 +3260,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 123,
+        "pointer" : 125,
         "source_range" : (
           {
           },
@@ -3251,7 +3273,7 @@
         "attributes" : [
           <"VisibilityAttr" : (
             {
-              "pointer" : 124,
+              "pointer" : 126,
               "source_range" : (
                 {
                 },
@@ -3260,6 +3282,28 @@
               )
             },
             <"DefaultVisibility">
+          )>,
+          <"ReturnsNonNullAttr" : (
+            {
+              "pointer" : 127,
+              "source_range" : (
+                {
+                },
+                {
+                }
+              )
+            }
+          )>,
+          <"AllocSizeAttr" : (
+            {
+              "pointer" : 128,
+              "source_range" : (
+                {
+                },
+                {
+                }
+              )
+            }
           )>
         ]
       },
@@ -3270,7 +3314,7 @@
         ]
       },
       {
-        "type_ptr" : 121
+        "type_ptr" : 123
       },
       {
         "mangled_name" : "5124988689061404296",
@@ -3278,7 +3322,7 @@
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 125,
+              "pointer" : 129,
               "source_range" : (
                 {
                 },
@@ -3305,7 +3349,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 126,
+        "pointer" : 130,
         "source_range" : (
           {
           },
@@ -3318,7 +3362,7 @@
         "attributes" : [
           <"VisibilityAttr" : (
             {
-              "pointer" : 127,
+              "pointer" : 131,
               "source_range" : (
                 {
                 },
@@ -3337,7 +3381,7 @@
         ]
       },
       {
-        "type_ptr" : 128
+        "type_ptr" : 132
       },
       {
         "mangled_name" : "9332647001762808742",
@@ -3345,7 +3389,7 @@
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 129,
+              "pointer" : 133,
               "source_range" : (
                 {
                 },
@@ -3361,7 +3405,7 @@
               ]
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
               "parm_index_in_function" : 0
@@ -3372,7 +3416,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 131,
+        "pointer" : 135,
         "source_range" : (
           {
           },
@@ -3385,7 +3429,7 @@
         "attributes" : [
           <"VisibilityAttr" : (
             {
-              "pointer" : 132,
+              "pointer" : 136,
               "source_range" : (
                 {
                 },
@@ -3404,7 +3448,7 @@
         ]
       },
       {
-        "type_ptr" : 128
+        "type_ptr" : 132
       },
       {
         "mangled_name" : "12453587667872411061",
@@ -3412,7 +3456,7 @@
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 133,
+              "pointer" : 137,
               "source_range" : (
                 {
                 },
@@ -3428,7 +3472,7 @@
               ]
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
               "parm_index_in_function" : 0
@@ -3439,7 +3483,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 134,
+        "pointer" : 138,
         "source_range" : (
           {
             "line" : 38,
@@ -3463,10 +3507,10 @@
       {
         "mangled_name" : "6095890702841955930",
         "is_cpp" : true,
-        "decl_ptr_with_body" : 134,
+        "decl_ptr_with_body" : 138,
         "body" : <"CompoundStmt" : (
           {
-            "pointer" : 135,
+            "pointer" : 139,
             "source_range" : (
               {
                 "line" : 38,
@@ -3481,7 +3525,7 @@
           [
             <"DeclStmt" : (
               {
-                "pointer" : 136,
+                "pointer" : 140,
                 "source_range" : (
                   {
                     "line" : 39,
@@ -3495,7 +3539,7 @@
               [
                 <"CXXNewExpr" : (
                   {
-                    "pointer" : 137,
+                    "pointer" : 141,
                     "source_range" : (
                       {
                         "column" : 13
@@ -3508,7 +3552,7 @@
                   [
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 138,
+                        "pointer" : 142,
                         "source_range" : (
                           {
                             "column" : 21
@@ -3521,7 +3565,7 @@
                       [
                         <"IntegerLiteral" : (
                           {
-                            "pointer" : 139,
+                            "pointer" : 143,
                             "source_range" : (
                               {
                                 "column" : 21
@@ -3558,7 +3602,7 @@
                     )>,
                     <"InitListExpr" : (
                       {
-                        "pointer" : 140,
+                        "pointer" : 144,
                         "source_range" : (
                           {
                             "column" : 23
@@ -3571,7 +3615,7 @@
                       [
                         <"IntegerLiteral" : (
                           {
-                            "pointer" : 141,
+                            "pointer" : 145,
                             "source_range" : (
                               {
                                 "column" : 24
@@ -3596,7 +3640,7 @@
                         )>,
                         <"IntegerLiteral" : (
                           {
-                            "pointer" : 142,
+                            "pointer" : 146,
                             "source_range" : (
                               {
                                 "column" : 27
@@ -3621,7 +3665,7 @@
                         )>,
                         <"IntegerLiteral" : (
                           {
-                            "pointer" : 143,
+                            "pointer" : 147,
                             "source_range" : (
                               {
                                 "column" : 30
@@ -3647,7 +3691,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 144
+                          "type_ptr" : 148
                         }
                       }
                     )>
@@ -3659,15 +3703,15 @@
                   },
                   {
                     "is_array" : true,
-                    "array_size_expr" : 138,
-                    "initializer_expr" : 140
+                    "array_size_expr" : 142,
+                    "initializer_expr" : 144
                   }
                 )>
               ],
               [
                 <"VarDecl" : (
                   {
-                    "pointer" : 145,
+                    "pointer" : 149,
                     "source_range" : (
                       {
                         "column" : 3
@@ -3689,7 +3733,7 @@
                   {
                     "init_expr" : <"CXXNewExpr" : (
                       {
-                        "pointer" : 137,
+                        "pointer" : 141,
                         "source_range" : (
                           {
                             "column" : 13
@@ -3702,7 +3746,7 @@
                       [
                         <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 138,
+                            "pointer" : 142,
                             "source_range" : (
                               {
                                 "column" : 21
@@ -3715,7 +3759,7 @@
                           [
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 139,
+                                "pointer" : 143,
                                 "source_range" : (
                                   {
                                     "column" : 21
@@ -3752,7 +3796,7 @@
                         )>,
                         <"InitListExpr" : (
                           {
-                            "pointer" : 140,
+                            "pointer" : 144,
                             "source_range" : (
                               {
                                 "column" : 23
@@ -3765,7 +3809,7 @@
                           [
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 141,
+                                "pointer" : 145,
                                 "source_range" : (
                                   {
                                     "column" : 24
@@ -3790,7 +3834,7 @@
                             )>,
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 142,
+                                "pointer" : 146,
                                 "source_range" : (
                                   {
                                     "column" : 27
@@ -3815,7 +3859,7 @@
                             )>,
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 143,
+                                "pointer" : 147,
                                 "source_range" : (
                                   {
                                     "column" : 30
@@ -3841,7 +3885,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 144
+                              "type_ptr" : 148
                             }
                           }
                         )>
@@ -3853,8 +3897,8 @@
                       },
                       {
                         "is_array" : true,
-                        "array_size_expr" : 138,
-                        "initializer_expr" : 140
+                        "array_size_expr" : 142,
+                        "initializer_expr" : 144
                       }
                     )>
                   }
@@ -3863,7 +3907,7 @@
             )>,
             <"DeclStmt" : (
               {
-                "pointer" : 146,
+                "pointer" : 150,
                 "source_range" : (
                   {
                     "line" : 40,
@@ -3877,7 +3921,7 @@
               [
                 <"CXXNewExpr" : (
                   {
-                    "pointer" : 147,
+                    "pointer" : 151,
                     "source_range" : (
                       {
                         "column" : 13
@@ -3890,7 +3934,7 @@
                   [
                     <"CXXConstructExpr" : (
                       {
-                        "pointer" : 148,
+                        "pointer" : 152,
                         "source_range" : (
                           {
                             "column" : 17
@@ -3903,7 +3947,7 @@
                       [
                         <"IntegerLiteral" : (
                           {
-                            "pointer" : 149,
+                            "pointer" : 153,
                             "source_range" : (
                               {
                                 "column" : 25
@@ -3928,7 +3972,7 @@
                         )>,
                         <"IntegerLiteral" : (
                           {
-                            "pointer" : 150,
+                            "pointer" : 154,
                             "source_range" : (
                               {
                                 "column" : 28
@@ -3981,14 +4025,14 @@
                     }
                   },
                   {
-                    "initializer_expr" : 148
+                    "initializer_expr" : 152
                   }
                 )>
               ],
               [
                 <"VarDecl" : (
                   {
-                    "pointer" : 151,
+                    "pointer" : 155,
                     "source_range" : (
                       {
                         "column" : 3
@@ -4010,7 +4054,7 @@
                   {
                     "init_expr" : <"CXXNewExpr" : (
                       {
-                        "pointer" : 147,
+                        "pointer" : 151,
                         "source_range" : (
                           {
                             "column" : 13
@@ -4023,7 +4067,7 @@
                       [
                         <"CXXConstructExpr" : (
                           {
-                            "pointer" : 148,
+                            "pointer" : 152,
                             "source_range" : (
                               {
                                 "column" : 17
@@ -4036,7 +4080,7 @@
                           [
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 149,
+                                "pointer" : 153,
                                 "source_range" : (
                                   {
                                     "column" : 25
@@ -4061,7 +4105,7 @@
                             )>,
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 150,
+                                "pointer" : 154,
                                 "source_range" : (
                                   {
                                     "column" : 28
@@ -4114,7 +4158,7 @@
                         }
                       },
                       {
-                        "initializer_expr" : 148
+                        "initializer_expr" : 152
                       }
                     )>
                   }
@@ -4123,7 +4167,7 @@
             )>,
             <"DeclStmt" : (
               {
-                "pointer" : 152,
+                "pointer" : 156,
                 "source_range" : (
                   {
                     "line" : 41,
@@ -4137,7 +4181,7 @@
               [
                 <"CXXNewExpr" : (
                   {
-                    "pointer" : 153,
+                    "pointer" : 157,
                     "source_range" : (
                       {
                         "column" : 15
@@ -4150,7 +4194,7 @@
                   [
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 154,
+                        "pointer" : 158,
                         "source_range" : (
                           {
                             "column" : 27
@@ -4163,7 +4207,7 @@
                       [
                         <"IntegerLiteral" : (
                           {
-                            "pointer" : 155,
+                            "pointer" : 159,
                             "source_range" : (
                               {
                                 "column" : 27
@@ -4200,7 +4244,7 @@
                     )>,
                     <"InitListExpr" : (
                       {
-                        "pointer" : 156,
+                        "pointer" : 160,
                         "source_range" : (
                           {
                             "column" : 29
@@ -4213,7 +4257,7 @@
                       [
                         <"CXXConstructExpr" : (
                           {
-                            "pointer" : 157,
+                            "pointer" : 161,
                             "source_range" : (
                               {
                                 "column" : 30
@@ -4226,7 +4270,7 @@
                           [
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 158,
+                                "pointer" : 162,
                                 "source_range" : (
                                   {
                                     "column" : 31
@@ -4251,7 +4295,7 @@
                             )>,
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 159,
+                                "pointer" : 163,
                                 "source_range" : (
                                   {
                                     "column" : 34
@@ -4299,7 +4343,7 @@
                         )>,
                         <"CXXConstructExpr" : (
                           {
-                            "pointer" : 160,
+                            "pointer" : 164,
                             "source_range" : (
                               {
                                 "column" : 38
@@ -4312,7 +4356,7 @@
                           [
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 161,
+                                "pointer" : 165,
                                 "source_range" : (
                                   {
                                     "column" : 39
@@ -4337,7 +4381,7 @@
                             )>,
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 162,
+                                "pointer" : 166,
                                 "source_range" : (
                                   {
                                     "column" : 42
@@ -4385,7 +4429,7 @@
                         )>,
                         <"CXXConstructExpr" : (
                           {
-                            "pointer" : 163,
+                            "pointer" : 167,
                             "source_range" : (
                               {
                                 "column" : 46
@@ -4398,7 +4442,7 @@
                           [
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 164,
+                                "pointer" : 168,
                                 "source_range" : (
                                   {
                                     "column" : 47
@@ -4423,7 +4467,7 @@
                             )>,
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 165,
+                                "pointer" : 169,
                                 "source_range" : (
                                   {
                                     "column" : 50
@@ -4472,7 +4516,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 166
+                          "type_ptr" : 170
                         }
                       }
                     )>
@@ -4484,15 +4528,15 @@
                   },
                   {
                     "is_array" : true,
-                    "array_size_expr" : 154,
-                    "initializer_expr" : 156
+                    "array_size_expr" : 158,
+                    "initializer_expr" : 160
                   }
                 )>
               ],
               [
                 <"VarDecl" : (
                   {
-                    "pointer" : 167,
+                    "pointer" : 171,
                     "source_range" : (
                       {
                         "column" : 3
@@ -4514,7 +4558,7 @@
                   {
                     "init_expr" : <"CXXNewExpr" : (
                       {
-                        "pointer" : 153,
+                        "pointer" : 157,
                         "source_range" : (
                           {
                             "column" : 15
@@ -4527,7 +4571,7 @@
                       [
                         <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 154,
+                            "pointer" : 158,
                             "source_range" : (
                               {
                                 "column" : 27
@@ -4540,7 +4584,7 @@
                           [
                             <"IntegerLiteral" : (
                               {
-                                "pointer" : 155,
+                                "pointer" : 159,
                                 "source_range" : (
                                   {
                                     "column" : 27
@@ -4577,7 +4621,7 @@
                         )>,
                         <"InitListExpr" : (
                           {
-                            "pointer" : 156,
+                            "pointer" : 160,
                             "source_range" : (
                               {
                                 "column" : 29
@@ -4590,7 +4634,7 @@
                           [
                             <"CXXConstructExpr" : (
                               {
-                                "pointer" : 157,
+                                "pointer" : 161,
                                 "source_range" : (
                                   {
                                     "column" : 30
@@ -4603,7 +4647,7 @@
                               [
                                 <"IntegerLiteral" : (
                                   {
-                                    "pointer" : 158,
+                                    "pointer" : 162,
                                     "source_range" : (
                                       {
                                         "column" : 31
@@ -4628,7 +4672,7 @@
                                 )>,
                                 <"IntegerLiteral" : (
                                   {
-                                    "pointer" : 159,
+                                    "pointer" : 163,
                                     "source_range" : (
                                       {
                                         "column" : 34
@@ -4676,7 +4720,7 @@
                             )>,
                             <"CXXConstructExpr" : (
                               {
-                                "pointer" : 160,
+                                "pointer" : 164,
                                 "source_range" : (
                                   {
                                     "column" : 38
@@ -4689,7 +4733,7 @@
                               [
                                 <"IntegerLiteral" : (
                                   {
-                                    "pointer" : 161,
+                                    "pointer" : 165,
                                     "source_range" : (
                                       {
                                         "column" : 39
@@ -4714,7 +4758,7 @@
                                 )>,
                                 <"IntegerLiteral" : (
                                   {
-                                    "pointer" : 162,
+                                    "pointer" : 166,
                                     "source_range" : (
                                       {
                                         "column" : 42
@@ -4762,7 +4806,7 @@
                             )>,
                             <"CXXConstructExpr" : (
                               {
-                                "pointer" : 163,
+                                "pointer" : 167,
                                 "source_range" : (
                                   {
                                     "column" : 46
@@ -4775,7 +4819,7 @@
                               [
                                 <"IntegerLiteral" : (
                                   {
-                                    "pointer" : 164,
+                                    "pointer" : 168,
                                     "source_range" : (
                                       {
                                         "column" : 47
@@ -4800,7 +4844,7 @@
                                 )>,
                                 <"IntegerLiteral" : (
                                   {
-                                    "pointer" : 165,
+                                    "pointer" : 169,
                                     "source_range" : (
                                       {
                                         "column" : 50
@@ -4849,7 +4893,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 166
+                              "type_ptr" : 170
                             }
                           }
                         )>
@@ -4861,8 +4905,8 @@
                       },
                       {
                         "is_array" : true,
-                        "array_size_expr" : 154,
-                        "initializer_expr" : 156
+                        "array_size_expr" : 158,
+                        "initializer_expr" : 160
                       }
                     )>
                   }
@@ -4875,7 +4919,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 168,
+        "pointer" : 172,
         "source_range" : (
           {
             "line" : 45,
@@ -4896,7 +4940,7 @@
         ]
       },
       {
-        "type_ptr" : 169
+        "type_ptr" : 173
       },
       {
         "mangled_name" : "13351464032276683690",
@@ -4904,7 +4948,7 @@
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 170,
+              "pointer" : 174,
               "source_range" : (
                 {
                   "line" : 45,
@@ -4930,7 +4974,7 @@
           )>,
           <"ParmVarDecl" : (
             {
-              "pointer" : 171,
+              "pointer" : 175,
               "source_range" : (
                 {
                   "column" : 40
@@ -4947,7 +4991,7 @@
               ]
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
               "parm_index_in_function" : 1
@@ -4955,7 +4999,7 @@
           )>,
           <"ParmVarDecl" : (
             {
-              "pointer" : 172,
+              "pointer" : 176,
               "source_range" : (
                 {
                   "column" : 51
@@ -4974,17 +5018,17 @@
               ]
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
               "parm_index_in_function" : 2
             }
           )>
         ],
-        "decl_ptr_with_body" : 168,
+        "decl_ptr_with_body" : 172,
         "body" : <"CompoundStmt" : (
           {
-            "pointer" : 173,
+            "pointer" : 177,
             "source_range" : (
               {
                 "column" : 72
@@ -4998,7 +5042,7 @@
           [
             <"ReturnStmt" : (
               {
-                "pointer" : 174,
+                "pointer" : 178,
                 "source_range" : (
                   {
                     "line" : 46,
@@ -5012,7 +5056,7 @@
               [
                 <"ImplicitCastExpr" : (
                   {
-                    "pointer" : 175,
+                    "pointer" : 179,
                     "source_range" : (
                       {
                         "column" : 10
@@ -5025,7 +5069,7 @@
                   [
                     <"DeclRefExpr" : (
                       {
-                        "pointer" : 176,
+                        "pointer" : 180,
                         "source_range" : (
                           {
                             "column" : 10
@@ -5039,14 +5083,14 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 130
+                          "type_ptr" : 134
                         },
                         "value_kind" : <"LValue">
                       },
                       {
                         "decl_ref" : {
                           "kind" : <"ParmVar">,
-                          "decl_pointer" : 172,
+                          "decl_pointer" : 176,
                           "name" : {
                             "name" : "ptr2",
                             "qual_name" : [
@@ -5054,7 +5098,7 @@
                             ]
                           },
                           "qual_type" : {
-                            "type_ptr" : 130
+                            "type_ptr" : 134
                           }
                         }
                       }
@@ -5062,7 +5106,7 @@
                   ],
                   {
                     "qual_type" : {
-                      "type_ptr" : 130
+                      "type_ptr" : 134
                     }
                   },
                   {
@@ -5079,7 +5123,7 @@
     )>,
     <"EmptyDecl" : (
       {
-        "pointer" : 177,
+        "pointer" : 181,
         "source_range" : (
           {
             "line" : 47,
@@ -5093,7 +5137,7 @@
     )>,
     <"FunctionDecl" : (
       {
-        "pointer" : 178,
+        "pointer" : 182,
         "source_range" : (
           {
             "line" : 49,
@@ -5112,7 +5156,7 @@
         ]
       },
       {
-        "type_ptr" : 179
+        "type_ptr" : 183
       },
       {
         "mangled_name" : "1553186570458038035",
@@ -5120,7 +5164,7 @@
         "parameters" : [
           <"ParmVarDecl" : (
             {
-              "pointer" : 180,
+              "pointer" : 184,
               "source_range" : (
                 {
                   "line" : 49,
@@ -5140,17 +5184,17 @@
               ]
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
               "parm_index_in_function" : 0
             }
           )>
         ],
-        "decl_ptr_with_body" : 178,
+        "decl_ptr_with_body" : 182,
         "body" : <"CompoundStmt" : (
           {
-            "pointer" : 181,
+            "pointer" : 185,
             "source_range" : (
               {
                 "column" : 32
@@ -5164,7 +5208,7 @@
           [
             <"DeclStmt" : (
               {
-                "pointer" : 182,
+                "pointer" : 186,
                 "source_range" : (
                   {
                     "line" : 50,
@@ -5178,7 +5222,7 @@
               [
                 <"IntegerLiteral" : (
                   {
-                    "pointer" : 183,
+                    "pointer" : 187,
                     "source_range" : (
                       {
                         "column" : 11
@@ -5205,7 +5249,7 @@
               [
                 <"VarDecl" : (
                   {
-                    "pointer" : 184,
+                    "pointer" : 188,
                     "source_range" : (
                       {
                         "column" : 3
@@ -5229,7 +5273,7 @@
                   {
                     "init_expr" : <"IntegerLiteral" : (
                       {
-                        "pointer" : 183,
+                        "pointer" : 187,
                         "source_range" : (
                           {
                             "column" : 11
@@ -5258,7 +5302,7 @@
             )>,
             <"DeclStmt" : (
               {
-                "pointer" : 185,
+                "pointer" : 189,
                 "source_range" : (
                   {
                     "line" : 51,
@@ -5272,7 +5316,7 @@
               [
                 <"CXXNewExpr" : (
                   {
-                    "pointer" : 186,
+                    "pointer" : 190,
                     "source_range" : (
                       {
                         "column" : 13
@@ -5285,7 +5329,7 @@
                   [
                     <"CXXConstructExpr" : (
                       {
-                        "pointer" : 187,
+                        "pointer" : 191,
                         "source_range" : (
                           {
                             "column" : 27
@@ -5321,7 +5365,7 @@
                     )>,
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 188,
+                        "pointer" : 192,
                         "source_range" : (
                           {
                             "column" : 18
@@ -5334,7 +5378,7 @@
                       [
                         <"DeclRefExpr" : (
                           {
-                            "pointer" : 189,
+                            "pointer" : 193,
                             "source_range" : (
                               {
                                 "column" : 18
@@ -5348,14 +5392,14 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 130
+                              "type_ptr" : 134
                             },
                             "value_kind" : <"LValue">
                           },
                           {
                             "decl_ref" : {
                               "kind" : <"ParmVar">,
-                              "decl_pointer" : 180,
+                              "decl_pointer" : 184,
                               "name" : {
                                 "name" : "ptr",
                                 "qual_name" : [
@@ -5363,7 +5407,7 @@
                                 ]
                               },
                               "qual_type" : {
-                                "type_ptr" : 130
+                                "type_ptr" : 134
                               }
                             }
                           }
@@ -5371,7 +5415,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 130
+                          "type_ptr" : 134
                         }
                       },
                       {
@@ -5382,7 +5426,7 @@
                     )>,
                     <"ImplicitCastExpr" : (
                       {
-                        "pointer" : 190,
+                        "pointer" : 194,
                         "source_range" : (
                           {
                             "column" : 23
@@ -5395,7 +5439,7 @@
                       [
                         <"UnaryOperator" : (
                           {
-                            "pointer" : 191,
+                            "pointer" : 195,
                             "source_range" : (
                               {
                                 "column" : 23
@@ -5408,7 +5452,7 @@
                           [
                             <"DeclRefExpr" : (
                               {
-                                "pointer" : 192,
+                                "pointer" : 196,
                                 "source_range" : (
                                   {
                                     "column" : 24
@@ -5429,7 +5473,7 @@
                               {
                                 "decl_ref" : {
                                   "kind" : <"Var">,
-                                  "decl_pointer" : 184,
+                                  "decl_pointer" : 188,
                                   "name" : {
                                     "name" : "i",
                                     "qual_name" : [
@@ -5455,7 +5499,7 @@
                       ],
                       {
                         "qual_type" : {
-                          "type_ptr" : 130
+                          "type_ptr" : 134
                         }
                       },
                       {
@@ -5471,10 +5515,10 @@
                     }
                   },
                   {
-                    "initializer_expr" : 187,
+                    "initializer_expr" : 191,
                     "placement_args" : [
-                      188,
-                      190
+                      192,
+                      194
                     ]
                   }
                 )>
@@ -5482,7 +5526,7 @@
               [
                 <"VarDecl" : (
                   {
-                    "pointer" : 193,
+                    "pointer" : 197,
                     "source_range" : (
                       {
                         "column" : 3
@@ -5504,7 +5548,7 @@
                   {
                     "init_expr" : <"CXXNewExpr" : (
                       {
-                        "pointer" : 186,
+                        "pointer" : 190,
                         "source_range" : (
                           {
                             "column" : 13
@@ -5517,7 +5561,7 @@
                       [
                         <"CXXConstructExpr" : (
                           {
-                            "pointer" : 187,
+                            "pointer" : 191,
                             "source_range" : (
                               {
                                 "column" : 27
@@ -5553,7 +5597,7 @@
                         )>,
                         <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 188,
+                            "pointer" : 192,
                             "source_range" : (
                               {
                                 "column" : 18
@@ -5566,7 +5610,7 @@
                           [
                             <"DeclRefExpr" : (
                               {
-                                "pointer" : 189,
+                                "pointer" : 193,
                                 "source_range" : (
                                   {
                                     "column" : 18
@@ -5580,14 +5624,14 @@
                               ],
                               {
                                 "qual_type" : {
-                                  "type_ptr" : 130
+                                  "type_ptr" : 134
                                 },
                                 "value_kind" : <"LValue">
                               },
                               {
                                 "decl_ref" : {
                                   "kind" : <"ParmVar">,
-                                  "decl_pointer" : 180,
+                                  "decl_pointer" : 184,
                                   "name" : {
                                     "name" : "ptr",
                                     "qual_name" : [
@@ -5595,7 +5639,7 @@
                                     ]
                                   },
                                   "qual_type" : {
-                                    "type_ptr" : 130
+                                    "type_ptr" : 134
                                   }
                                 }
                               }
@@ -5603,7 +5647,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 130
+                              "type_ptr" : 134
                             }
                           },
                           {
@@ -5614,7 +5658,7 @@
                         )>,
                         <"ImplicitCastExpr" : (
                           {
-                            "pointer" : 190,
+                            "pointer" : 194,
                             "source_range" : (
                               {
                                 "column" : 23
@@ -5627,7 +5671,7 @@
                           [
                             <"UnaryOperator" : (
                               {
-                                "pointer" : 191,
+                                "pointer" : 195,
                                 "source_range" : (
                                   {
                                     "column" : 23
@@ -5640,7 +5684,7 @@
                               [
                                 <"DeclRefExpr" : (
                                   {
-                                    "pointer" : 192,
+                                    "pointer" : 196,
                                     "source_range" : (
                                       {
                                         "column" : 24
@@ -5661,7 +5705,7 @@
                                   {
                                     "decl_ref" : {
                                       "kind" : <"Var">,
-                                      "decl_pointer" : 184,
+                                      "decl_pointer" : 188,
                                       "name" : {
                                         "name" : "i",
                                         "qual_name" : [
@@ -5687,7 +5731,7 @@
                           ],
                           {
                             "qual_type" : {
-                              "type_ptr" : 130
+                              "type_ptr" : 134
                             }
                           },
                           {
@@ -5703,10 +5747,10 @@
                         }
                       },
                       {
-                        "initializer_expr" : 187,
+                        "initializer_expr" : 191,
                         "placement_args" : [
-                          188,
-                          190
+                          192,
+                          194
                         ]
                       }
                     )>
@@ -5720,7 +5764,7 @@
     )>,
     <"TypedefDecl" : (
       {
-        "pointer" : 194,
+        "pointer" : 198,
         "source_range" : (
           {
           },
@@ -5735,7 +5779,7 @@
           "instancetype"
         ]
       },
-      195,
+      199,
       {
       }
     )>
@@ -5761,25 +5805,25 @@
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 196
+          "pointer" : 200
         },
         <"Bool">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 197
+          "pointer" : 201
         },
         <"Char_S">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 198
+          "pointer" : 202
         },
         <"SChar">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 199
+          "pointer" : 203
         },
         <"Short">
       )>,
@@ -5791,31 +5835,31 @@
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 200
+          "pointer" : 204
         },
         <"Long">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 201
+          "pointer" : 205
         },
         <"LongLong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 202
+          "pointer" : 206
         },
         <"UChar">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 203
+          "pointer" : 207
         },
         <"UShort">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 204
+          "pointer" : 208
         },
         <"UInt">
       )>,
@@ -5827,303 +5871,303 @@
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 205
+          "pointer" : 209
         },
         <"ULongLong">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 206
+          "pointer" : 210
         },
         <"Float">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 207
+          "pointer" : 211
         },
         <"Double">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 208
+          "pointer" : 212
         },
         <"LongDouble">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 209
+          "pointer" : 213
         },
         <"Float128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 210
+          "pointer" : 214
         },
         <"Float16">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 211
+          "pointer" : 215
         },
         <"ShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 212
+          "pointer" : 216
         },
         <"Accum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 213
+          "pointer" : 217
         },
         <"LongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 214
+          "pointer" : 218
         },
         <"UShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 215
+          "pointer" : 219
         },
         <"UAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 216
+          "pointer" : 220
         },
         <"ULongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 217
+          "pointer" : 221
         },
         <"ShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 218
+          "pointer" : 222
         },
         <"Fract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 219
+          "pointer" : 223
         },
         <"LongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 220
+          "pointer" : 224
         },
         <"UShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 221
+          "pointer" : 225
         },
         <"UFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 222
+          "pointer" : 226
         },
         <"ULongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 223
+          "pointer" : 227
         },
         <"SatShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 224
+          "pointer" : 228
         },
         <"SatAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 225
+          "pointer" : 229
         },
         <"SatLongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 226
+          "pointer" : 230
         },
         <"SatUShortAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 227
+          "pointer" : 231
         },
         <"SatUAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 228
+          "pointer" : 232
         },
         <"SatULongAccum">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 229
+          "pointer" : 233
         },
         <"SatShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 230
+          "pointer" : 234
         },
         <"SatFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 231
+          "pointer" : 235
         },
         <"SatLongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 232
+          "pointer" : 236
         },
         <"SatUShortFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 233
+          "pointer" : 237
         },
         <"SatUFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 234
+          "pointer" : 238
         },
         <"SatULongFract">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 235
+          "pointer" : 239
         },
         <"Int128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 236
+          "pointer" : 240
         },
         <"UInt128">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 237
+          "pointer" : 241
         },
         <"WChar_S">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 238
+          "pointer" : 242
         },
         <"Char8">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 239
+          "pointer" : 243
         },
         <"Char16">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 240
+          "pointer" : 244
         },
         <"Char32">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 241
+          "pointer" : 245
         },
         <"Dependent">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 242
+          "pointer" : 246
         },
         <"Overload">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 243
+          "pointer" : 247
         },
         <"BoundMember">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 244
+          "pointer" : 248
         },
         <"PseudoObject">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 245
+          "pointer" : 249
         },
         <"UnknownAny">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 246
+          "pointer" : 250
         },
         <"ARCUnbridgedCast">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 247
+          "pointer" : 251
         },
         <"BuiltinFn">
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 248
+          "pointer" : 252
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 249
+          "pointer" : 253
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 250
+          "pointer" : 254
         }
       )>,
       <"ComplexType" : (
         {
-          "pointer" : 251
+          "pointer" : 255
         }
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 252
+          "pointer" : 256
         },
         <"ObjCId">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 253
+          "pointer" : 257
         },
         <"ObjCClass">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 254
+          "pointer" : 258
         },
         <"ObjCSel">
       )>,
       <"PointerType" : (
         {
-          "pointer" : 130
+          "pointer" : 134
         },
         {
           "type_ptr" : 100
@@ -6131,25 +6175,31 @@
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 255
+          "pointer" : 259
         },
         <"NullPtr">
       )>,
       <"BuiltinType" : (
         {
-          "pointer" : 256
+          "pointer" : 260
         },
         <"Half">
       )>,
+      <"BuiltinType" : (
+        {
+          "pointer" : 261
+        },
+        <"BFloat16">
+      )>,
       <"RecordType" : (
         {
-          "pointer" : 257
+          "pointer" : 262
         },
-        258
+        263
       )>,
       <"PointerType" : (
         {
-          "pointer" : 259
+          "pointer" : 264
         },
         {
           "type_ptr" : 11,
@@ -6158,34 +6208,34 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 260
+          "pointer" : 265
         },
         {
-          "type_ptr" : 197,
+          "type_ptr" : 201,
           "is_const" : true
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 261
+          "pointer" : 266
         },
         {
-          "type_ptr" : 197
+          "type_ptr" : 201
         }
       )>,
       <"RecordType" : (
         {
-          "pointer" : 262
+          "pointer" : 267
         },
-        263
+        268
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 264
+          "pointer" : 269
         },
         {
           "element_type" : {
-            "type_ptr" : 262
+            "type_ptr" : 267
           },
           "stride" : 24
         },
@@ -6245,7 +6295,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 265
+          "pointer" : 270
         },
         {
           "return_type" : {
@@ -6266,7 +6316,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 266
+          "pointer" : 271
         },
         {
           "return_type" : {
@@ -6308,7 +6358,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 267
+          "pointer" : 272
         },
         {
           "return_type" : {
@@ -6354,10 +6404,10 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 268
+          "pointer" : 273
         },
         {
-          "type_ptr" : 269
+          "type_ptr" : 274
         }
       )>,
       <"PointerType" : (
@@ -6370,11 +6420,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 121
+          "pointer" : 123
         },
         {
           "return_type" : {
-            "type_ptr" : 130
+            "type_ptr" : 134
           }
         },
         {
@@ -6387,7 +6437,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 179
+          "pointer" : 183
         },
         {
           "return_type" : {
@@ -6397,14 +6447,14 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 128
+          "pointer" : 132
         },
         {
           "return_type" : {
@@ -6414,35 +6464,35 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             }
           ]
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 270
+          "pointer" : 275
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 271
+          "pointer" : 276
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 272
+          "pointer" : 277
         },
         {
-          "type_ptr" : 270
+          "type_ptr" : 275
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 273
+          "pointer" : 278
         },
         {
-          "type_ptr" : 271
+          "type_ptr" : 276
         }
       )>,
       <"AutoType" : (
@@ -6461,7 +6511,7 @@
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 274
+          "pointer" : 279
         },
         {
           "element_type" : {
@@ -6473,15 +6523,15 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 275
+          "pointer" : 280
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 276
+          "pointer" : 281
         },
         {
-          "type_ptr" : 275
+          "type_ptr" : 280
         }
       )>,
       <"PointerType" : (
@@ -6494,15 +6544,15 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 277
+          "pointer" : 282
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 278
+          "pointer" : 283
         },
         {
-          "type_ptr" : 277
+          "type_ptr" : 282
         }
       )>,
       <"AutoType" : (
@@ -6533,7 +6583,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 279
+          "pointer" : 284
         },
         {
           "return_type" : {
@@ -6545,15 +6595,15 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 280
+          "pointer" : 285
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 281
+          "pointer" : 286
         },
         {
-          "type_ptr" : 280
+          "type_ptr" : 285
         }
       )>,
       <"LValueReferenceType" : (
@@ -6567,7 +6617,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 282
+          "pointer" : 287
         },
         {
           "return_type" : {
@@ -6609,7 +6659,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 283
+          "pointer" : 288
         },
         {
           "return_type" : {
@@ -6643,15 +6693,15 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 284
+          "pointer" : 289
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 285
+          "pointer" : 290
         },
         {
-          "type_ptr" : 284
+          "type_ptr" : 289
         }
       )>,
       <"AutoType" : (
@@ -6682,7 +6732,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 286
+          "pointer" : 291
         },
         {
           "return_type" : {
@@ -6694,20 +6744,20 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 287
+          "pointer" : 292
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 288
+          "pointer" : 293
         },
         {
-          "type_ptr" : 287
+          "type_ptr" : 292
         }
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 144
+          "pointer" : 148
         },
         {
           "element_type" : {
@@ -6719,33 +6769,33 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 289
+          "pointer" : 294
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 290
+          "pointer" : 295
         },
         {
-          "type_ptr" : 289
+          "type_ptr" : 294
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 291
+          "pointer" : 296
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 292
+          "pointer" : 297
         },
         {
-          "type_ptr" : 291
+          "type_ptr" : 296
         }
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 166
+          "pointer" : 170
         },
         {
           "element_type" : {
@@ -6757,24 +6807,24 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 293
+          "pointer" : 298
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 294
+          "pointer" : 299
         },
         {
-          "type_ptr" : 293
+          "type_ptr" : 298
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 295
+          "pointer" : 300
         },
         {
           "return_type" : {
-            "type_ptr" : 130
+            "type_ptr" : 134
           }
         },
         {
@@ -6783,21 +6833,21 @@
               "type_ptr" : 67
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 169
+          "pointer" : 173
         },
         {
           "return_type" : {
-            "type_ptr" : 130
+            "type_ptr" : 134
           }
         },
         {
@@ -6806,17 +6856,17 @@
               "type_ptr" : 67
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 296
+          "pointer" : 301
         },
         {
           "return_type" : {
@@ -6826,68 +6876,68 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             },
             {
-              "type_ptr" : 130
+              "type_ptr" : 134
             }
           ]
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 297
+          "pointer" : 302
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 298
+          "pointer" : 303
         },
         {
-          "type_ptr" : 297
+          "type_ptr" : 302
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 299
+          "pointer" : 304
         },
         {
-          "base_type" : 252
+          "base_type" : 256
         }
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 300
+          "pointer" : 305
         },
         {
-          "type_ptr" : 299
+          "type_ptr" : 304
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 301,
-          "desugared_type" : 300
+          "pointer" : 306,
+          "desugared_type" : 305
         },
         {
           "child_type" : {
-            "type_ptr" : 300
+            "type_ptr" : 305
           },
-          "decl_ptr" : 302
+          "decl_ptr" : 307
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 195,
-          "desugared_type" : 300
+          "pointer" : 199,
+          "desugared_type" : 305
         },
         {
           "child_type" : {
-            "type_ptr" : 301
+            "type_ptr" : 306
           },
-          "decl_ptr" : 194
+          "decl_ptr" : 198
         }
       )>,
       <"NoneType" : (
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/no_except_expr.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/no_except_expr.cpp.exp
index ae881d685..53a09ab24 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/no_except_expr.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/no_except_expr.cpp.exp
@@ -781,15 +781,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 88
         },
-        89
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 89
+        },
+        90
       )>,
       <"PointerType" : (
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "type_ptr" : 23,
@@ -798,7 +804,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 91
+          "pointer" : 92
         },
         {
           "type_ptr" : 26,
@@ -807,7 +813,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 92
+          "pointer" : 93
         },
         {
           "type_ptr" : 26
@@ -815,17 +821,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 93
+          "pointer" : 94
         },
-        94
+        95
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 95
+          "pointer" : 96
         },
         {
           "element_type" : {
-            "type_ptr" : 93
+            "type_ptr" : 94
           },
           "stride" : 24
         },
@@ -833,7 +839,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 96
+          "pointer" : 97
         },
         {
           "return_type" : {
@@ -869,18 +875,18 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 97
+          "pointer" : 98
         },
         {
-          "type_ptr" : 92
+          "type_ptr" : 93
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 98
+          "pointer" : 99
         },
         {
-          "type_ptr" : 96
+          "type_ptr" : 97
         }
       )>,
       <"PointerType" : (
@@ -893,7 +899,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 99
+          "pointer" : 100
         },
         {
           "base_type" : 82
@@ -901,32 +907,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 100
+          "pointer" : 101
         },
         {
-          "type_ptr" : 99
+          "type_ptr" : 100
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 101,
-          "desugared_type" : 100
+          "pointer" : 102,
+          "desugared_type" : 101
         },
         {
           "child_type" : {
-            "type_ptr" : 100
+            "type_ptr" : 101
           },
-          "decl_ptr" : 102
+          "decl_ptr" : 103
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 25,
-          "desugared_type" : 100
+          "desugared_type" : 101
         },
         {
           "child_type" : {
-            "type_ptr" : 101
+            "type_ptr" : 102
           },
           "decl_ptr" : 24
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/objcpp_template_unboxing.mm.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/objcpp_template_unboxing.mm.exp
index ee1f37b85..5d0a28223 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/objcpp_template_unboxing.mm.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/objcpp_template_unboxing.mm.exp
@@ -650,17 +650,23 @@
         },
         <"Half">
       )>,
-      <"PointerType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 80
         },
+        <"BFloat16">
+      )>,
+      <"PointerType" : (
+        {
+          "pointer" : 81
+        },
         {
           "type_ptr" : 76
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 81
+          "pointer" : 82
         },
         {
           "base_type" : 74
@@ -668,15 +674,15 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 82
+          "pointer" : 83
         },
         {
-          "type_ptr" : 81
+          "type_ptr" : 82
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 83
+          "pointer" : 84
         },
         {
           "base_type" : 75
@@ -684,27 +690,27 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
-          "type_ptr" : 83
+          "type_ptr" : 84
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 85
+          "pointer" : 86
         },
         8
       )>,
       <"RecordType" : (
         {
-          "pointer" : 86
+          "pointer" : 87
         },
-        87
+        88
       )>,
       <"PointerType" : (
         {
-          "pointer" : 88
+          "pointer" : 89
         },
         {
           "type_ptr" : 20,
@@ -713,7 +719,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
           "type_ptr" : 17,
@@ -722,7 +728,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "type_ptr" : 17
@@ -730,17 +736,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 91
+          "pointer" : 92
         },
-        92
+        93
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 93
+          "pointer" : 94
         },
         {
           "element_type" : {
-            "type_ptr" : 91
+            "type_ptr" : 92
           },
           "stride" : 24
         },
@@ -748,17 +754,17 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 94
+          "pointer" : 95
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 95
+          "pointer" : 96
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 96
+          "pointer" : 97
         },
         {
           "return_type" : {
@@ -768,14 +774,14 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 94
+              "type_ptr" : 95
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 97
+          "pointer" : 98
         },
         {
           "return_type" : {
@@ -785,7 +791,7 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 95
+              "type_ptr" : 96
             }
           ]
         }
@@ -793,11 +799,11 @@
       <"TypedefType" : (
         {
           "pointer" : 6,
-          "desugared_type" : 82
+          "desugared_type" : 83
         },
         {
           "child_type" : {
-            "type_ptr" : 82
+            "type_ptr" : 83
           },
           "decl_ptr" : 5
         }
@@ -805,7 +811,7 @@
       <"TypedefType" : (
         {
           "pointer" : 14,
-          "desugared_type" : 82
+          "desugared_type" : 83
         },
         {
           "child_type" : {
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/optional.m.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/optional.m.exp
index 04d727dae..e7af5bd07 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/optional.m.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/optional.m.exp
@@ -1937,17 +1937,23 @@
         },
         <"Half">
       )>,
-      <"PointerType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 113
         },
+        <"BFloat16">
+      )>,
+      <"PointerType" : (
+        {
+          "pointer" : 114
+        },
         {
           "type_ptr" : 109
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 114
+          "pointer" : 115
         },
         {
           "base_type" : 107
@@ -1955,15 +1961,15 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 115
+          "pointer" : 116
         },
         {
-          "type_ptr" : 114
+          "type_ptr" : 115
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 116
+          "pointer" : 117
         },
         {
           "base_type" : 108
@@ -1971,27 +1977,27 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 117
+          "pointer" : 118
         },
         {
-          "type_ptr" : 116
+          "type_ptr" : 117
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 118
+          "pointer" : 119
         },
         9
       )>,
       <"RecordType" : (
         {
-          "pointer" : 119
+          "pointer" : 120
         },
-        120
+        121
       )>,
       <"PointerType" : (
         {
-          "pointer" : 121
+          "pointer" : 122
         },
         {
           "type_ptr" : 56,
@@ -2000,7 +2006,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 122
+          "pointer" : 123
         },
         {
           "type_ptr" : 53,
@@ -2009,7 +2015,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 123
+          "pointer" : 124
         },
         {
           "type_ptr" : 53
@@ -2017,17 +2023,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 124
+          "pointer" : 125
         },
-        125
+        126
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 126
+          "pointer" : 127
         },
         {
           "element_type" : {
-            "type_ptr" : 124
+            "type_ptr" : 125
           },
           "stride" : 24
         },
@@ -2035,18 +2041,18 @@
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 127
+          "pointer" : 128
         },
         13
       )>,
       <"TypedefType" : (
         {
           "pointer" : 7,
-          "desugared_type" : 115
+          "desugared_type" : 116
         },
         {
           "child_type" : {
-            "type_ptr" : 115
+            "type_ptr" : 116
           },
           "decl_ptr" : 6
         }
@@ -2054,7 +2060,7 @@
       <"TypedefType" : (
         {
           "pointer" : 51,
-          "desugared_type" : 115
+          "desugared_type" : 116
         },
         {
           "child_type" : {
@@ -2066,24 +2072,24 @@
       <"TypedefType" : (
         {
           "pointer" : 5,
-          "desugared_type" : 113
+          "desugared_type" : 114
         },
         {
           "child_type" : {
-            "type_ptr" : 113
+            "type_ptr" : 114
           },
           "decl_ptr" : 4
         }
       )>,
       <"ObjCInterfaceType" : (
         {
-          "pointer" : 128
+          "pointer" : 129
         },
         20
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 129
+          "pointer" : 130
         },
         {
           "base_type" : 107,
@@ -2097,7 +2103,7 @@
           "pointer" : 22
         },
         {
-          "type_ptr" : 129
+          "type_ptr" : 130
         }
       )>,
       <"ObjCObjectPointerType" : (
@@ -2105,7 +2111,7 @@
           "pointer" : 27
         },
         {
-          "type_ptr" : 128
+          "type_ptr" : 129
         }
       )>,
       <"NoneType" : (
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/sizeof_static_evaluation.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/sizeof_static_evaluation.cpp.exp
index 1e97bd7c2..f7c52bc04 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/sizeof_static_evaluation.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/sizeof_static_evaluation.cpp.exp
@@ -318,7 +318,7 @@
             "type_ptr" : 19
           },
           {
-            "mangled_name" : "800005863435481739",
+            "mangled_name" : "2670522532645241414",
             "is_cpp" : true,
             "decl_ptr_with_body" : 18,
             "body" : <"CompoundStmt" : (
@@ -351,7 +351,7 @@
       },
       {
       },
-      "2204753185921246810",
+      "",
       {
         "template_decl" : 7,
         "specialization_args" : [
@@ -862,15 +862,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 90
         },
-        91
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 91
+        },
+        92
       )>,
       <"PointerType" : (
         {
-          "pointer" : 92
+          "pointer" : 93
         },
         {
           "type_ptr" : 12,
@@ -879,7 +885,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 93
+          "pointer" : 94
         },
         {
           "type_ptr" : 25,
@@ -888,7 +894,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 94
+          "pointer" : 95
         },
         {
           "type_ptr" : 25
@@ -896,17 +902,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 95
+          "pointer" : 96
         },
-        96
+        97
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 97
+          "pointer" : 98
         },
         {
           "element_type" : {
-            "type_ptr" : 95
+            "type_ptr" : 96
           },
           "stride" : 24
         },
@@ -919,22 +925,22 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 98
+          "pointer" : 99
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 99
+          "pointer" : 100
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 100
+          "pointer" : 101
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 101
+          "pointer" : 102
         }
       )>,
       <"TemplateTypeParmType" : (
@@ -944,12 +950,12 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 102
+          "pointer" : 103
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 103
+          "pointer" : 104
         }
       )>,
       <"InjectedClassNameType" : (
@@ -959,12 +965,12 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 104
+          "pointer" : 105
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 105
+          "pointer" : 106
         },
         {
           "type_ptr" : 9
@@ -984,7 +990,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 106
+          "pointer" : 107
         },
         {
           "base_type" : 84
@@ -992,32 +998,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 107
+          "pointer" : 108
         },
         {
-          "type_ptr" : 106
+          "type_ptr" : 107
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 108,
-          "desugared_type" : 107
+          "pointer" : 109,
+          "desugared_type" : 108
         },
         {
           "child_type" : {
-            "type_ptr" : 107
+            "type_ptr" : 108
           },
-          "decl_ptr" : 109
+          "decl_ptr" : 110
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 27,
-          "desugared_type" : 107
+          "desugared_type" : 108
         },
         {
           "child_type" : {
-            "type_ptr" : 108
+            "type_ptr" : 109
           },
           "decl_ptr" : 26
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/struct.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/struct.cpp.exp
index 1c0e8be4f..b17e2fcf4 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/struct.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/struct.cpp.exp
@@ -386,7 +386,7 @@
                         "type_ptr" : 21
                       },
                       {
-                        "mangled_name" : "4417717915555375243",
+                        "mangled_name" : "6288234584765134918",
                         "is_cpp" : true,
                         "is_inline" : true,
                         "decl_ptr_with_body" : 20,
@@ -437,7 +437,7 @@
                         "type_ptr" : 24
                       },
                       {
-                        "mangled_name" : "4190573168950999278",
+                        "mangled_name" : "5359255322723102949",
                         "is_cpp" : true,
                         "is_inline" : true,
                         "parameters" : [
@@ -499,7 +499,7 @@
                         "type_ptr" : 28
                       },
                       {
-                        "mangled_name" : "12437859369676964978",
+                        "mangled_name" : "18224946875082286891",
                         "is_cpp" : true,
                         "is_inline" : true,
                         "parameters" : [
@@ -1461,15 +1461,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 115
         },
-        116
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 116
+        },
+        117
       )>,
       <"PointerType" : (
         {
-          "pointer" : 117
+          "pointer" : 118
         },
         {
           "type_ptr" : 42,
@@ -1478,7 +1484,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 118
+          "pointer" : 119
         },
         {
           "type_ptr" : 54,
@@ -1487,7 +1493,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 119
+          "pointer" : 120
         },
         {
           "type_ptr" : 54
@@ -1495,17 +1501,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 120
+          "pointer" : 121
         },
-        121
+        122
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 122
+          "pointer" : 123
         },
         {
           "element_type" : {
-            "type_ptr" : 120
+            "type_ptr" : 121
           },
           "stride" : 24
         },
@@ -1537,7 +1543,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 123
+          "pointer" : 124
         },
         {
           "return_type" : {
@@ -1558,7 +1564,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 124
+          "pointer" : 125
         },
         {
           "return_type" : {
@@ -1600,7 +1606,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 125
+          "pointer" : 126
         },
         {
           "return_type" : {
@@ -1658,7 +1664,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 126
+          "pointer" : 127
         },
         {
           "base_type" : 109
@@ -1666,32 +1672,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 127
+          "pointer" : 128
         },
         {
-          "type_ptr" : 126
+          "type_ptr" : 127
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 128,
-          "desugared_type" : 127
+          "pointer" : 129,
+          "desugared_type" : 128
         },
         {
           "child_type" : {
-            "type_ptr" : 127
+            "type_ptr" : 128
           },
-          "decl_ptr" : 129
+          "decl_ptr" : 130
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 51,
-          "desugared_type" : 127
+          "desugared_type" : 128
         },
         {
           "child_type" : {
-            "type_ptr" : 128
+            "type_ptr" : 129
           },
           "decl_ptr" : 50
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/template_instantiations.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/template_instantiations.cpp.exp
index 7e306f0ef..7f2180459 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/template_instantiations.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/template_instantiations.cpp.exp
@@ -169,7 +169,7 @@
             },
             {
             },
-            "2296961816144140105",
+            "",
             {
               "template_decl" : 7,
               "specialization_args" : [
@@ -266,7 +266,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "16263929779680628849",
+                  "mangled_name" : "15507823120941368224",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 14,
@@ -316,7 +316,7 @@
                   "type_ptr" : 18
                 },
                 {
-                  "mangled_name" : "11014497521477142187",
+                  "mangled_name" : "651618469270041090",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -377,7 +377,7 @@
                   "type_ptr" : 22
                 },
                 {
-                  "mangled_name" : "15031955784438883279",
+                  "mangled_name" : "14649822005097330172",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -423,7 +423,7 @@
             {
               "is_pod" : true
             },
-            "8342447397680512296",
+            "",
             {
               "template_decl" : 7,
               "specialization_args" : [
@@ -631,7 +631,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "10023818314310534501",
+                  "mangled_name" : "9282946488688737892",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 34,
@@ -681,7 +681,7 @@
                   "type_ptr" : 37
                 },
                 {
-                  "mangled_name" : "11471169980769644070",
+                  "mangled_name" : "4835163870722214719",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -742,7 +742,7 @@
                   "type_ptr" : 41
                 },
                 {
-                  "mangled_name" : "11154857410366551354",
+                  "mangled_name" : "14658047667100730153",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -788,7 +788,7 @@
             {
               "is_pod" : true
             },
-            "11141543725649308068",
+            "",
             {
               "template_decl" : 30,
               "specialization_args" : [
@@ -968,7 +968,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "1478228132453016226",
+                  "mangled_name" : "18054455536952808167",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 51,
@@ -1018,7 +1018,7 @@
                   "type_ptr" : 54
                 },
                 {
-                  "mangled_name" : "11043804702208708385",
+                  "mangled_name" : "12602934757794480668",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1079,7 +1079,7 @@
                   "type_ptr" : 58
                 },
                 {
-                  "mangled_name" : "5185260157533638819",
+                  "mangled_name" : "3579925925305368200",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1125,7 +1125,7 @@
             {
               "is_pod" : true
             },
-            "18441911275316219119",
+            "",
             {
               "template_decl" : 47,
               "specialization_args" : [
@@ -1243,7 +1243,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "16225353893069217924",
+                  "mangled_name" : "16721342488904302213",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 65,
@@ -1293,7 +1293,7 @@
                   "type_ptr" : 68
                 },
                 {
-                  "mangled_name" : "16636418989297388895",
+                  "mangled_name" : "6201193260347400774",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1354,7 +1354,7 @@
                   "type_ptr" : 72
                 },
                 {
-                  "mangled_name" : "2774670671732909065",
+                  "mangled_name" : "17328475686832768154",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1400,7 +1400,7 @@
             {
               "is_pod" : true
             },
-            "7893038887469539829",
+            "",
             {
               "template_decl" : 61,
               "specialization_args" : [
@@ -1518,7 +1518,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "16125716847522929195",
+                  "mangled_name" : "17996233516732688870",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 79,
@@ -1568,7 +1568,7 @@
                   "type_ptr" : 82
                 },
                 {
-                  "mangled_name" : "5156418638880841616",
+                  "mangled_name" : "8170411964911509925",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1629,7 +1629,7 @@
                   "type_ptr" : 86
                 },
                 {
-                  "mangled_name" : "18073023600850944380",
+                  "mangled_name" : "16625409861663294039",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -1675,7 +1675,7 @@
             {
               "is_pod" : true
             },
-            "6282617124311682814",
+            "",
             {
               "template_decl" : 75,
               "specialization_args" : [
@@ -1979,7 +1979,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "8438636393447290261",
+                  "mangled_name" : "7942647797612205972",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 102,
@@ -2029,7 +2029,7 @@
                   "type_ptr" : 105
                 },
                 {
-                  "mangled_name" : "304459608885830774",
+                  "mangled_name" : "13792914784228561871",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -2090,7 +2090,7 @@
                   "type_ptr" : 109
                 },
                 {
-                  "mangled_name" : "5555169503117312650",
+                  "mangled_name" : "6395019852822673209",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -2136,7 +2136,7 @@
             {
               "is_pod" : true
             },
-            "92945586264616176",
+            "",
             {
               "template_decl" : 98,
               "specialization_args" : [
@@ -2260,7 +2260,7 @@
             "type_ptr" : 15
           },
           {
-            "mangled_name" : "14898916407379161639",
+            "mangled_name" : "16769433076588921314",
             "is_cpp" : true,
             "is_inline" : true,
             "decl_ptr_with_body" : 117,
@@ -2310,7 +2310,7 @@
             "type_ptr" : 120
           },
           {
-            "mangled_name" : "7125450473324676530",
+            "mangled_name" : "18119742553314115417",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -2371,7 +2371,7 @@
             "type_ptr" : 124
           },
           {
-            "mangled_name" : "3069361207223136310",
+            "mangled_name" : "14901405322990444079",
             "is_cpp" : true,
             "is_inline" : true,
             "parameters" : [
@@ -2458,7 +2458,7 @@
             {
               "name" : "Z",
               "qual_name" : [
-                "Z<&y>"
+                "Z<y>"
               ]
             },
             129,
@@ -2482,7 +2482,7 @@
                   "name" : "Z",
                   "qual_name" : [
                     "Z",
-                    "Z<&y>"
+                    "Z<y>"
                   ]
                 },
                 129,
@@ -2518,14 +2518,14 @@
                   "name" : "Z",
                   "qual_name" : [
                     "Z",
-                    "Z<&y>"
+                    "Z<y>"
                   ]
                 },
                 {
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "2247315131692507250",
+                  "mangled_name" : "499240077376103735",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 131,
@@ -2568,14 +2568,14 @@
                   "name" : "Z",
                   "qual_name" : [
                     "Z",
-                    "Z<&y>"
+                    "Z<y>"
                   ]
                 },
                 {
                   "type_ptr" : 134
                 },
                 {
-                  "mangled_name" : "7738251501016099665",
+                  "mangled_name" : "17768891565958800780",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -2629,14 +2629,14 @@
                   "name" : "Z",
                   "qual_name" : [
                     "Z",
-                    "Z<&y>"
+                    "Z<y>"
                   ]
                 },
                 {
                   "type_ptr" : 138
                 },
                 {
-                  "mangled_name" : "15832834678910379731",
+                  "mangled_name" : "5257127409284049912",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -2682,7 +2682,7 @@
             {
               "is_pod" : true
             },
-            "4282980438553401163",
+            "",
             {
               "template_decl" : 127,
               "specialization_args" : [
@@ -2797,7 +2797,7 @@
             {
               "name" : "W",
               "qual_name" : [
-                "W<&b>"
+                "W<b>"
               ]
             },
             145,
@@ -2821,7 +2821,7 @@
                   "name" : "W",
                   "qual_name" : [
                     "W",
-                    "W<&b>"
+                    "W<b>"
                   ]
                 },
                 145,
@@ -2857,14 +2857,14 @@
                   "name" : "W",
                   "qual_name" : [
                     "W",
-                    "W<&b>"
+                    "W<b>"
                   ]
                 },
                 {
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "7772438286950717212",
+                  "mangled_name" : "8268180592181082237",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 147,
@@ -2907,14 +2907,14 @@
                   "name" : "W",
                   "qual_name" : [
                     "W",
-                    "W<&b>"
+                    "W<b>"
                   ]
                 },
                 {
                   "type_ptr" : 150
                 },
                 {
-                  "mangled_name" : "10597356402107300951",
+                  "mangled_name" : "15184425556926585790",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -2968,14 +2968,14 @@
                   "name" : "W",
                   "qual_name" : [
                     "W",
-                    "W<&b>"
+                    "W<b>"
                   ]
                 },
                 {
                   "type_ptr" : 154
                 },
                 {
-                  "mangled_name" : "9048930144420503889",
+                  "mangled_name" : "2251022854406196514",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -3021,7 +3021,7 @@
             {
               "is_pod" : true
             },
-            "632323835311287041",
+            "",
             {
               "template_decl" : 143,
               "specialization_args" : [
@@ -3223,7 +3223,7 @@
                   "type_ptr" : 15
                 },
                 {
-                  "mangled_name" : "3658993291457928989",
+                  "mangled_name" : "3162969511250741948",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "decl_ptr_with_body" : 166,
@@ -3273,7 +3273,7 @@
                   "type_ptr" : 169
                 },
                 {
-                  "mangled_name" : "18252192508176638302",
+                  "mangled_name" : "943561519717330679",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -3334,7 +3334,7 @@
                   "type_ptr" : 173
                 },
                 {
-                  "mangled_name" : "9481628931273708930",
+                  "mangled_name" : "16348915219842036529",
                   "is_cpp" : true,
                   "is_inline" : true,
                   "parameters" : [
@@ -3380,7 +3380,7 @@
             {
               "is_pod" : true
             },
-            "6648620333758562824",
+            "",
             {
               "template_decl" : 162,
               "specialization_args" : [
@@ -3504,7 +3504,7 @@
                 "name" : "Z",
                 "qual_name" : [
                   "Z",
-                  "Z<&y>"
+                  "Z<y>"
                 ]
               },
               "qual_type" : {
@@ -3566,7 +3566,7 @@
                 "name" : "W",
                 "qual_name" : [
                   "W",
-                  "W<&b>"
+                  "W<b>"
                 ]
               },
               "qual_type" : {
@@ -4062,15 +4062,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 254
         },
-        255
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 255
+        },
+        256
       )>,
       <"PointerType" : (
         {
-          "pointer" : 256
+          "pointer" : 257
         },
         {
           "type_ptr" : 10,
@@ -4079,7 +4085,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 257
+          "pointer" : 258
         },
         {
           "type_ptr" : 192,
@@ -4088,7 +4094,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 258
+          "pointer" : 259
         },
         {
           "type_ptr" : 192
@@ -4096,17 +4102,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 259
+          "pointer" : 260
         },
-        260
+        261
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 261
+          "pointer" : 262
         },
         {
           "element_type" : {
-            "type_ptr" : 259
+            "type_ptr" : 260
           },
           "stride" : 24
         },
@@ -4114,37 +4120,37 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 262
+          "pointer" : 263
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 263
+          "pointer" : 264
         }
       )>,
       <"PackExpansionType" : (
         {
-          "pointer" : 264
+          "pointer" : 265
         }
       )>,
       <"PackExpansionType" : (
         {
-          "pointer" : 265
+          "pointer" : 266
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 266
+          "pointer" : 267
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 267
+          "pointer" : 268
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 268
+          "pointer" : 269
         }
       )>,
       <"RecordType" : (
@@ -4155,7 +4161,7 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 269,
+          "pointer" : 270,
           "desugared_type" : 9
         }
       )>,
@@ -4173,7 +4179,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 270
+          "pointer" : 271
         },
         {
           "return_type" : {
@@ -4185,7 +4191,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 271
+          "pointer" : 272
         },
         {
           "return_type" : {
@@ -4206,7 +4212,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 272
+          "pointer" : 273
         },
         {
           "return_type" : {
@@ -4248,7 +4254,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 273
+          "pointer" : 274
         },
         {
           "return_type" : {
@@ -4294,7 +4300,7 @@
       )>,
       <"DecltypeType" : (
         {
-          "pointer" : 274,
+          "pointer" : 275,
           "desugared_type" : 252
         },
         {
@@ -4308,24 +4314,24 @@
         },
         {
           "child_type" : {
-            "type_ptr" : 274
+            "type_ptr" : 275
           },
           "decl_ptr" : 28
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 275
+          "pointer" : 276
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 276
+          "pointer" : 277
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 277
+          "pointer" : 278
         }
       )>,
       <"RecordType" : (
@@ -4342,7 +4348,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 278
+          "pointer" : 279
         },
         {
           "return_type" : {
@@ -4363,7 +4369,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 279
+          "pointer" : 280
         },
         {
           "return_type" : {
@@ -4405,7 +4411,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 280
+          "pointer" : 281
         },
         {
           "return_type" : {
@@ -4439,47 +4445,47 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 281
+          "pointer" : 282
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 282
+          "pointer" : 283
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 283
+          "pointer" : 284
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 284
+          "pointer" : 285
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 285
+          "pointer" : 286
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 286
+          "pointer" : 287
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 287
+          "pointer" : 288
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 288
+          "pointer" : 289
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 289
+          "pointer" : 290
         }
       )>,
       <"RecordType" : (
@@ -4496,7 +4502,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 290
+          "pointer" : 291
         },
         {
           "return_type" : {
@@ -4517,7 +4523,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 291
+          "pointer" : 292
         },
         {
           "return_type" : {
@@ -4559,7 +4565,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 292
+          "pointer" : 293
         },
         {
           "return_type" : {
@@ -4605,7 +4611,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 293
+          "pointer" : 294
         },
         {
           "return_type" : {
@@ -4626,7 +4632,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 294
+          "pointer" : 295
         },
         {
           "return_type" : {
@@ -4668,7 +4674,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 295
+          "pointer" : 296
         },
         {
           "return_type" : {
@@ -4714,7 +4720,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 296
+          "pointer" : 297
         },
         {
           "return_type" : {
@@ -4735,7 +4741,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 297
+          "pointer" : 298
         },
         {
           "return_type" : {
@@ -4777,7 +4783,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 298
+          "pointer" : 299
         },
         {
           "return_type" : {
@@ -4811,17 +4817,17 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 299
+          "pointer" : 300
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 300
+          "pointer" : 301
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 301
+          "pointer" : 302
         }
       )>,
       <"ConstantArrayType" : (
@@ -4853,22 +4859,22 @@
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 302
+          "pointer" : 303
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 303
+          "pointer" : 304
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 304
+          "pointer" : 305
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 305
+          "pointer" : 306
         },
         {
           "return_type" : {
@@ -4880,7 +4886,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 306
+          "pointer" : 307
         },
         {
           "return_type" : {
@@ -4922,7 +4928,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 307
+          "pointer" : 308
         },
         {
           "return_type" : {
@@ -4968,7 +4974,7 @@
       )>,
       <"ParenType" : (
         {
-          "pointer" : 308,
+          "pointer" : 309,
           "desugared_type" : 158
         },
         {
@@ -4977,7 +4983,7 @@
       )>,
       <"LValueReferenceType" : (
         {
-          "pointer" : 309
+          "pointer" : 310
         },
         {
           "type_ptr" : 158
@@ -4985,25 +4991,25 @@
       )>,
       <"LValueReferenceType" : (
         {
-          "pointer" : 310
+          "pointer" : 311
         },
         {
-          "type_ptr" : 308
+          "type_ptr" : 309
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 311
+          "pointer" : 312
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 312
+          "pointer" : 313
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 313
+          "pointer" : 314
         }
       )>,
       <"FunctionProtoType" : (
@@ -5025,7 +5031,7 @@
       )>,
       <"ParenType" : (
         {
-          "pointer" : 314,
+          "pointer" : 315,
           "desugared_type" : 160
         },
         {
@@ -5034,7 +5040,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 315
+          "pointer" : 316
         },
         {
           "type_ptr" : 160
@@ -5042,30 +5048,30 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 316
+          "pointer" : 317
         },
         {
-          "type_ptr" : 314
+          "type_ptr" : 315
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 317
+          "pointer" : 318
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 318
+          "pointer" : 319
         }
       )>,
       <"InjectedClassNameType" : (
         {
-          "pointer" : 319
+          "pointer" : 320
         }
       )>,
       <"PointerType" : (
         {
-          "pointer" : 320
+          "pointer" : 321
         },
         {
           "type_ptr" : 10
@@ -5085,7 +5091,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 321
+          "pointer" : 322
         },
         {
           "return_type" : {
@@ -5106,7 +5112,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 322
+          "pointer" : 323
         },
         {
           "return_type" : {
@@ -5148,7 +5154,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 323
+          "pointer" : 324
         },
         {
           "return_type" : {
@@ -5194,7 +5200,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 324
+          "pointer" : 325
         },
         {
           "return_type" : {
@@ -5215,7 +5221,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 325
+          "pointer" : 326
         },
         {
           "return_type" : {
@@ -5257,7 +5263,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 326
+          "pointer" : 327
         },
         {
           "return_type" : {
@@ -5303,7 +5309,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 327
+          "pointer" : 328
         },
         {
           "return_type" : {
@@ -5324,7 +5330,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 328
+          "pointer" : 329
         },
         {
           "return_type" : {
@@ -5366,7 +5372,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 329
+          "pointer" : 330
         },
         {
           "return_type" : {
@@ -5412,7 +5418,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 330
+          "pointer" : 331
         },
         {
           "return_type" : {
@@ -5433,7 +5439,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 331
+          "pointer" : 332
         },
         {
           "return_type" : {
@@ -5475,7 +5481,7 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 332
+          "pointer" : 333
         },
         {
           "return_type" : {
@@ -5509,7 +5515,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 333
+          "pointer" : 334
         },
         {
           "base_type" : 248
@@ -5517,32 +5523,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 334
+          "pointer" : 335
         },
         {
-          "type_ptr" : 333
+          "type_ptr" : 334
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 335,
-          "desugared_type" : 334
+          "pointer" : 336,
+          "desugared_type" : 335
         },
         {
           "child_type" : {
-            "type_ptr" : 334
+            "type_ptr" : 335
           },
-          "decl_ptr" : 336
+          "decl_ptr" : 337
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 189,
-          "desugared_type" : 334
+          "desugared_type" : 335
         },
         {
           "child_type" : {
-            "type_ptr" : 335
+            "type_ptr" : 336
           },
           "decl_ptr" : 188
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/this.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/this.cpp.exp
index 6692fb026..741326cec 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/this.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/this.cpp.exp
@@ -799,15 +799,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 86
         },
-        87
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 87
+        },
+        88
       )>,
       <"PointerType" : (
         {
-          "pointer" : 88
+          "pointer" : 89
         },
         {
           "type_ptr" : 11,
@@ -816,7 +822,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
           "type_ptr" : 24,
@@ -825,7 +831,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "type_ptr" : 24
@@ -833,17 +839,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 91
+          "pointer" : 92
         },
-        92
+        93
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 93
+          "pointer" : 94
         },
         {
           "element_type" : {
-            "type_ptr" : 91
+            "type_ptr" : 92
           },
           "stride" : 24
         },
@@ -877,7 +883,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 94
+          "pointer" : 95
         },
         {
           "base_type" : 80
@@ -885,32 +891,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 95
+          "pointer" : 96
         },
         {
-          "type_ptr" : 94
+          "type_ptr" : 95
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 96,
-          "desugared_type" : 95
+          "pointer" : 97,
+          "desugared_type" : 96
         },
         {
           "child_type" : {
-            "type_ptr" : 95
+            "type_ptr" : 96
           },
-          "decl_ptr" : 97
+          "decl_ptr" : 98
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 21,
-          "desugared_type" : 95
+          "desugared_type" : 96
         },
         {
           "child_type" : {
-            "type_ptr" : 96
+            "type_ptr" : 97
           },
           "decl_ptr" : 20
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/type_trait.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/type_trait.cpp.exp
index 46da8db58..66148752d 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/type_trait.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/type_trait.cpp.exp
@@ -372,7 +372,7 @@
             "type_ptr" : 22
           },
           {
-            "mangled_name" : "9850251229546392500",
+            "mangled_name" : "10975959821506117086",
             "is_cpp" : true,
             "is_inline" : true
           },
@@ -1275,15 +1275,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 109
         },
-        110
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 110
+        },
+        111
       )>,
       <"PointerType" : (
         {
-          "pointer" : 111
+          "pointer" : 112
         },
         {
           "type_ptr" : 30,
@@ -1292,7 +1298,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 112
+          "pointer" : 113
         },
         {
           "type_ptr" : 47,
@@ -1301,7 +1307,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 113
+          "pointer" : 114
         },
         {
           "type_ptr" : 47
@@ -1309,17 +1315,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 114
+          "pointer" : 115
         },
-        115
+        116
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 116
+          "pointer" : 117
         },
         {
           "element_type" : {
-            "type_ptr" : 114
+            "type_ptr" : 115
           },
           "stride" : 24
         },
@@ -1333,7 +1339,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 117
+          "pointer" : 118
         },
         {
           "type_ptr" : 8
@@ -1353,7 +1359,7 @@
       )>,
       <"LValueReferenceType" : (
         {
-          "pointer" : 118
+          "pointer" : 119
         },
         {
           "type_ptr" : 8
@@ -1370,11 +1376,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 119
+          "pointer" : 120
         },
         {
           "return_type" : {
-            "type_ptr" : 118
+            "type_ptr" : 119
           }
         },
         {
@@ -1391,7 +1397,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 118
+            "type_ptr" : 119
           }
         },
         {
@@ -1412,11 +1418,11 @@
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 120
+          "pointer" : 121
         },
         {
           "return_type" : {
-            "type_ptr" : 118
+            "type_ptr" : 119
           }
         },
         {
@@ -1433,7 +1439,7 @@
         },
         {
           "return_type" : {
-            "type_ptr" : 118
+            "type_ptr" : 119
           }
         },
         {
@@ -1458,12 +1464,12 @@
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 121
+          "pointer" : 122
         }
       )>,
       <"TemplateTypeParmType" : (
         {
-          "pointer" : 122
+          "pointer" : 123
         }
       )>,
       <"FunctionProtoType" : (
@@ -1488,19 +1494,19 @@
       )>,
       <"SubstTemplateTypeParmType" : (
         {
-          "pointer" : 123,
+          "pointer" : 124,
           "desugared_type" : 30
         }
       )>,
       <"SubstTemplateTypeParmType" : (
         {
-          "pointer" : 124,
+          "pointer" : 125,
           "desugared_type" : 8
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 125
+          "pointer" : 126
         },
         {
           "base_type" : 103
@@ -1508,32 +1514,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 126
+          "pointer" : 127
         },
         {
-          "type_ptr" : 125
+          "type_ptr" : 126
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 127,
-          "desugared_type" : 126
+          "pointer" : 128,
+          "desugared_type" : 127
         },
         {
           "child_type" : {
-            "type_ptr" : 126
+            "type_ptr" : 127
           },
-          "decl_ptr" : 128
+          "decl_ptr" : 129
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 45,
-          "desugared_type" : 126
+          "desugared_type" : 127
         },
         {
           "child_type" : {
-            "type_ptr" : 127
+            "type_ptr" : 128
           },
           "decl_ptr" : 44
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/unresolved_lookup.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/unresolved_lookup.cpp.exp
index fefbba355..bc49bf3a6 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/unresolved_lookup.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/unresolved_lookup.cpp.exp
@@ -561,15 +561,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 75
         },
-        76
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 76
+        },
+        77
       )>,
       <"PointerType" : (
         {
-          "pointer" : 77
+          "pointer" : 78
         },
         {
           "type_ptr" : 15,
@@ -578,7 +584,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 78
+          "pointer" : 79
         },
         {
           "type_ptr" : 12,
@@ -587,7 +593,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 79
+          "pointer" : 80
         },
         {
           "type_ptr" : 12
@@ -595,33 +601,28 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 80
+          "pointer" : 81
         },
-        81
+        82
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 82
+          "pointer" : 83
         },
         {
           "element_type" : {
-            "type_ptr" : 80
+            "type_ptr" : 81
           },
           "stride" : 24
         },
         1
       )>,
-      <"TemplateTypeParmType" : (
-        {
-          "pointer" : 83
-        }
-      )>,
       <"TemplateTypeParmType" : (
         {
           "pointer" : 84
         }
       )>,
-      <"TemplateSpecializationType" : (
+      <"TemplateTypeParmType" : (
         {
           "pointer" : 85
         }
@@ -631,12 +632,12 @@
           "pointer" : 86
         }
       )>,
-      <"InjectedClassNameType" : (
+      <"TemplateSpecializationType" : (
         {
           "pointer" : 87
         }
       )>,
-      <"TemplateTypeParmType" : (
+      <"InjectedClassNameType" : (
         {
           "pointer" : 88
         }
@@ -646,12 +647,9 @@
           "pointer" : 89
         }
       )>,
-      <"PointerType" : (
+      <"TemplateTypeParmType" : (
         {
           "pointer" : 90
-        },
-        {
-          "type_ptr" : 88
         }
       )>,
       <"PointerType" : (
@@ -667,13 +665,21 @@
           "pointer" : 92
         },
         {
-          "type_ptr" : 87
+          "type_ptr" : 90
         }
       )>,
-      <"FunctionProtoType" : (
+      <"PointerType" : (
         {
           "pointer" : 93
         },
+        {
+          "type_ptr" : 88
+        }
+      )>,
+      <"FunctionProtoType" : (
+        {
+          "pointer" : 94
+        },
         {
           "return_type" : {
             "type_ptr" : 15
@@ -682,14 +688,14 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 90
+              "type_ptr" : 91
             }
           ]
         }
       )>,
       <"FunctionProtoType" : (
         {
-          "pointer" : 94
+          "pointer" : 95
         },
         {
           "return_type" : {
@@ -699,20 +705,20 @@
         {
           "params_type" : [
             {
-              "type_ptr" : 91
+              "type_ptr" : 92
             }
           ]
         }
       )>,
       <"TemplateSpecializationType" : (
         {
-          "pointer" : 95,
-          "desugared_type" : 87
+          "pointer" : 96,
+          "desugared_type" : 88
         }
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 96
+          "pointer" : 97
         },
         {
           "base_type" : 69
@@ -720,32 +726,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 97
+          "pointer" : 98
         },
         {
-          "type_ptr" : 96
+          "type_ptr" : 97
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 98,
-          "desugared_type" : 97
+          "pointer" : 99,
+          "desugared_type" : 98
         },
         {
           "child_type" : {
-            "type_ptr" : 97
+            "type_ptr" : 98
           },
-          "decl_ptr" : 99
+          "decl_ptr" : 100
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 9,
-          "desugared_type" : 97
+          "desugared_type" : 98
         },
         {
           "child_type" : {
-            "type_ptr" : 98
+            "type_ptr" : 99
           },
           "decl_ptr" : 8
         }
diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/using_directive.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/using_directive.cpp.exp
index 19389361e..ce62201be 100644
--- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/using_directive.cpp.exp
+++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/using_directive.cpp.exp
@@ -820,15 +820,21 @@
         },
         <"Half">
       )>,
-      <"RecordType" : (
+      <"BuiltinType" : (
         {
           "pointer" : 82
         },
-        83
+        <"BFloat16">
+      )>,
+      <"RecordType" : (
+        {
+          "pointer" : 83
+        },
+        84
       )>,
       <"PointerType" : (
         {
-          "pointer" : 84
+          "pointer" : 85
         },
         {
           "type_ptr" : 10,
@@ -837,7 +843,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 85
+          "pointer" : 86
         },
         {
           "type_ptr" : 20,
@@ -846,7 +852,7 @@
       )>,
       <"PointerType" : (
         {
-          "pointer" : 86
+          "pointer" : 87
         },
         {
           "type_ptr" : 20
@@ -854,17 +860,17 @@
       )>,
       <"RecordType" : (
         {
-          "pointer" : 87
+          "pointer" : 88
         },
-        88
+        89
       )>,
       <"ConstantArrayType" : (
         {
-          "pointer" : 89
+          "pointer" : 90
         },
         {
           "element_type" : {
-            "type_ptr" : 87
+            "type_ptr" : 88
           },
           "stride" : 24
         },
@@ -872,7 +878,7 @@
       )>,
       <"ObjCObjectType" : (
         {
-          "pointer" : 90
+          "pointer" : 91
         },
         {
           "base_type" : 76
@@ -880,32 +886,32 @@
       )>,
       <"ObjCObjectPointerType" : (
         {
-          "pointer" : 91
+          "pointer" : 92
         },
         {
-          "type_ptr" : 90
+          "type_ptr" : 91
         }
       )>,
       <"TypedefType" : (
         {
-          "pointer" : 92,
-          "desugared_type" : 91
+          "pointer" : 93,
+          "desugared_type" : 92
         },
         {
           "child_type" : {
-            "type_ptr" : 91
+            "type_ptr" : 92
           },
-          "decl_ptr" : 93
+          "decl_ptr" : 94
         }
       )>,
       <"TypedefType" : (
         {
           "pointer" : 17,
-          "desugared_type" : 91
+          "desugared_type" : 92
         },
         {
           "child_type" : {
-            "type_ptr" : 92
+            "type_ptr" : 93
           },
           "decl_ptr" : 16
         }
diff --git a/infer/src/clang/CType_decl.ml b/infer/src/clang/CType_decl.ml
index 7d9216fdd..6dd68beaa 100644
--- a/infer/src/clang/CType_decl.ml
+++ b/infer/src/clang/CType_decl.ml
@@ -252,6 +252,7 @@ let get_struct_decls decl =
   | IndirectFieldDecl _
   | LabelDecl _
   | LifetimeExtendedTemporaryDecl _
+  | MSGuidDecl _
   | MSPropertyDecl _
   | NamespaceAliasDecl _
   | NonTypeTemplateParmDecl _
diff --git a/infer/src/clang/ClangCommand.ml b/infer/src/clang/ClangCommand.ml
index 70725bbe3..dcc7c5b1b 100644
--- a/infer/src/clang/ClangCommand.ml
+++ b/infer/src/clang/ClangCommand.ml
@@ -141,7 +141,7 @@ let filter_and_replace_unsupported_args ?(replace_options_arg = fun _ s -> s) ?(
 let clang_cc1_cmd_sanitizer cmd =
   let replace_args arg = function
     | Some override_regex when Str.string_match override_regex arg 0 ->
-        Config.fcp_dir ^/ "clang" ^/ "install" ^/ "lib" ^/ "clang" ^/ "10.0.1" ^/ "include"
+        Config.fcp_dir ^/ "clang" ^/ "install" ^/ "lib" ^/ "clang" ^/ "11.1.0" ^/ "include"
     | _ ->
         arg
   in
diff --git a/infer/src/clang/cFrontend_decl.ml b/infer/src/clang/cFrontend_decl.ml
index 68a938268..688cee1ed 100644
--- a/infer/src/clang/cFrontend_decl.ml
+++ b/infer/src/clang/cFrontend_decl.ml
@@ -195,6 +195,7 @@ module CFrontend_decl_funct (T : CModule_type.CTranslation) : CModule_type.CFron
     | LabelDecl _
     | LifetimeExtendedTemporaryDecl _
     | LinkageSpecDecl _
+    | MSGuidDecl _
     | MSPropertyDecl _
     | NamespaceAliasDecl _
     | NamespaceDecl _
diff --git a/infer/src/clang/cTrans.ml b/infer/src/clang/cTrans.ml
index 402a5656a..74f8ae370 100644
--- a/infer/src/clang/cTrans.ml
+++ b/infer/src/clang/cTrans.ml
@@ -4549,6 +4549,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
     | CoroutineBodyStmt _
     | CoyieldExpr _
     | CUDAKernelCallExpr _
+    | CXXAddrspaceCastExpr _
     | CXXFoldExpr _
     | CXXRewrittenBinaryOperator _
     | CXXUnresolvedConstructExpr _
@@ -4562,6 +4563,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
     | FunctionParmPackExpr _
     | ImaginaryLiteral _
     | IndirectGotoStmt _
+    | MatrixSubscriptExpr _
     | MSAsmStmt _
     | MSDependentExistsStmt _
     | MSPropertyRefExpr _
@@ -4570,11 +4572,13 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
     | ObjCIsaExpr _
     | ObjCSubscriptRefExpr _
     | OMPArraySectionExpr _
+    | OMPArrayShapingExpr _
     | OMPAtomicDirective _
     | OMPBarrierDirective _
     | OMPCancelDirective _
     | OMPCancellationPointDirective _
     | OMPCriticalDirective _
+    | OMPDepobjDirective _
     | OMPDistributeDirective _
     | OMPDistributeParallelForDirective _
     | OMPDistributeParallelForSimdDirective _
@@ -4582,6 +4586,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
     | OMPFlushDirective _
     | OMPForDirective _
     | OMPForSimdDirective _
+    | OMPIteratorExpr _
     | OMPMasterDirective _
     | OMPMasterTaskLoopDirective _
     | OMPMasterTaskLoopSimdDirective _
@@ -4593,6 +4598,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
     | OMPParallelMasterTaskLoopDirective _
     | OMPParallelMasterTaskLoopSimdDirective _
     | OMPParallelSectionsDirective _
+    | OMPScanDirective _
     | OMPSectionDirective _
     | OMPSectionsDirective _
     | OMPSimdDirective _
@@ -4624,6 +4630,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s
     | OMPTeamsDistributeSimdDirective _
     | PackExpansionExpr _
     | ParenListExpr _
+    | RecoveryExpr _
     | RequiresExpr _
     | SEHExceptStmt _
     | SEHFinallyStmt _
diff --git a/infer/tests/codetoanalyze/cpp/frontend/constructors.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/constructors.cpp.dot
index 2309ad578..078d055bc 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/constructors.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/constructors.cpp.dot
@@ -1,36 +1,36 @@
 /* @generated */
 digraph cfg {
-"C#C#{3580560627344463844|constexpr}.e3694fd364611ec17124e012297a2e86_1" [label="1: Start C::C\nFormals:  this:C* __param_0:C&\nLocals:  \n  " color=yellow style=filled]
+"C#C#{6498547058331613817|constexpr}.c6432a8706f7b868374c16c40ff09340_1" [label="1: Start C::C\nFormals:  this:C* __param_0:C&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "C#C#{3580560627344463844|constexpr}.e3694fd364611ec17124e012297a2e86_1" -> "C#C#{3580560627344463844|constexpr}.e3694fd364611ec17124e012297a2e86_2" ;
-"C#C#{3580560627344463844|constexpr}.e3694fd364611ec17124e012297a2e86_2" [label="2: Exit C::C \n  " color=yellow style=filled]
+	 "C#C#{6498547058331613817|constexpr}.c6432a8706f7b868374c16c40ff09340_1" -> "C#C#{6498547058331613817|constexpr}.c6432a8706f7b868374c16c40ff09340_2" ;
+"C#C#{6498547058331613817|constexpr}.c6432a8706f7b868374c16c40ff09340_2" [label="2: Exit C::C \n  " color=yellow style=filled]
 	
 
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_1" [label="1: Start D::D\nFormals:  this:D*\nLocals:  0$?%__sil_tmp__temp_construct_n$3:C 0$?%__sil_tmpSIL_materialize_temp__n$2:C \n  " color=yellow style=filled]
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_1" [label="1: Start D::D\nFormals:  this:D*\nLocals:  0$?%__sil_tmp__temp_construct_n$3:C 0$?%__sil_tmpSIL_materialize_temp__n$2:C \n  " color=yellow style=filled]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_1" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_2" [label="2: Exit D::D \n  " color=yellow style=filled]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_1" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_3" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_2" [label="2: Exit D::D \n  " color=yellow style=filled]
 	
 
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" [label="3:  Constructor Init \n   n$1=*&this:D* [line 14, column 9]\n " shape="box"]
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_3" [label="3:  Constructor Init \n   n$1=*&this:D* [line 14, column 9]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$2:C); [line 14, column 11]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:C=0 [line 14, column 11]\n " shape="box"]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_3" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_4" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(0$?%__sil_tmpSIL_materialize_temp__n$2:C); [line 14, column 11]\n  *&0$?%__sil_tmpSIL_materialize_temp__n$2:C=0 [line 14, column 11]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" [label="5:  Destruction(temporaries cleanup) \n   n$4=_fun_C::C(&0$?%__sil_tmp__temp_construct_n$3:C*,&0$?%__sil_tmpSIL_materialize_temp__n$2:C&) [line 14, column 11]\n  n$5=_fun_D::D(n$1:D*,&0$?%__sil_tmp__temp_construct_n$3:C) [line 14, column 9]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$2:C [line 14, column 14]\n  n$7=_fun_C::~C(&0$?%__sil_tmpSIL_materialize_temp__n$2:C*) injected [line 14, column 14]\n " shape="box"]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_4" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_5" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_5" [label="5:  Destruction(temporaries cleanup) \n   n$4=_fun_C::C(&0$?%__sil_tmp__temp_construct_n$3:C*,&0$?%__sil_tmpSIL_materialize_temp__n$2:C&) [line 14, column 11]\n  n$5=_fun_D::D(n$1:D*,&0$?%__sil_tmp__temp_construct_n$3:C) [line 14, column 9]\n  _=*&0$?%__sil_tmpSIL_materialize_temp__n$2:C [line 14, column 14]\n  n$7=_fun_C::~C(&0$?%__sil_tmpSIL_materialize_temp__n$2:C*) injected [line 14, column 14]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_2" ;
-"D#D#{5432425317638667422}.a4365e545a16987608e4a4e42a8d1c69_1" [label="1: Start D::D\nFormals:  this:D* x:C&\nLocals:  \n  " color=yellow style=filled]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_5" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_2" ;
+"D#D#{7015088767696084961}.bf3c7ccdb621750feffaf0f3563904a4_1" [label="1: Start D::D\nFormals:  this:D* x:C&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "D#D#{5432425317638667422}.a4365e545a16987608e4a4e42a8d1c69_1" -> "D#D#{5432425317638667422}.a4365e545a16987608e4a4e42a8d1c69_2" ;
-"D#D#{5432425317638667422}.a4365e545a16987608e4a4e42a8d1c69_2" [label="2: Exit D::D \n  " color=yellow style=filled]
+	 "D#D#{7015088767696084961}.bf3c7ccdb621750feffaf0f3563904a4_1" -> "D#D#{7015088767696084961}.bf3c7ccdb621750feffaf0f3563904a4_2" ;
+"D#D#{7015088767696084961}.bf3c7ccdb621750feffaf0f3563904a4_2" [label="2: Exit D::D \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/break_scope.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/break_scope.cpp.dot
index 3921b15d8..a7061d617 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/break_scope.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/break_scope.cpp.dot
@@ -492,38 +492,38 @@ digraph cfg {
 	
 
 	 "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_13" -> "test_while3#break_scope#10134831914750033380.7cab458a264bff5f98e4df48e17e8d7d_5" ;
-"X#X#break_scope#{17112813181908266985|constexpr}.6bb668d75bc820066f1fe22efb911729_1" [label="1: Start break_scope::X::X\nFormals:  this:break_scope::X* __param_0:break_scope::X const &\nLocals:  \n  " color=yellow style=filled]
+"X#X#break_scope#{4053540132469168612|constexpr}.c9ffba04b927de006fe23d98ce3b2d5b_1" [label="1: Start break_scope::X::X\nFormals:  this:break_scope::X* __param_0:break_scope::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#break_scope#{17112813181908266985|constexpr}.6bb668d75bc820066f1fe22efb911729_1" -> "X#X#break_scope#{17112813181908266985|constexpr}.6bb668d75bc820066f1fe22efb911729_2" ;
-"X#X#break_scope#{17112813181908266985|constexpr}.6bb668d75bc820066f1fe22efb911729_2" [label="2: Exit break_scope::X::X \n  " color=yellow style=filled]
+	 "X#X#break_scope#{4053540132469168612|constexpr}.c9ffba04b927de006fe23d98ce3b2d5b_1" -> "X#X#break_scope#{4053540132469168612|constexpr}.c9ffba04b927de006fe23d98ce3b2d5b_2" ;
+"X#X#break_scope#{4053540132469168612|constexpr}.c9ffba04b927de006fe23d98ce3b2d5b_2" [label="2: Exit break_scope::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#break_scope#{6309516816598689770|constexpr}.816885afcdb5a68230bfb3bf3d547c3d_1" [label="1: Start break_scope::X::X\nFormals:  this:break_scope::X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#break_scope#{4561406577910183503|constexpr}.d77af1d40f48b96452ba62e9e9c39c1a_1" [label="1: Start break_scope::X::X\nFormals:  this:break_scope::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#break_scope#{6309516816598689770|constexpr}.816885afcdb5a68230bfb3bf3d547c3d_1" -> "X#X#break_scope#{6309516816598689770|constexpr}.816885afcdb5a68230bfb3bf3d547c3d_2" ;
-"X#X#break_scope#{6309516816598689770|constexpr}.816885afcdb5a68230bfb3bf3d547c3d_2" [label="2: Exit break_scope::X::X \n  " color=yellow style=filled]
+	 "X#X#break_scope#{4561406577910183503|constexpr}.d77af1d40f48b96452ba62e9e9c39c1a_1" -> "X#X#break_scope#{4561406577910183503|constexpr}.d77af1d40f48b96452ba62e9e9c39c1a_2" ;
+"X#X#break_scope#{4561406577910183503|constexpr}.d77af1d40f48b96452ba62e9e9c39c1a_2" [label="2: Exit break_scope::X::X \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~X#X#break_scope#(321850372193847154).14fa9e76ae5ff70b9f49dbadc6e57d6c_1" [label="1: Start break_scope::X::__infer_inner_destructor_~X\nFormals:  this:break_scope::X*\nLocals:  \n  " color=yellow style=filled]
+"__infer_inner_destructor_~X#X#break_scope#(17520180356259547384).fa56341fa47a2c5b22d5af69667cafe8_1" [label="1: Start break_scope::X::__infer_inner_destructor_~X\nFormals:  this:break_scope::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~X#X#break_scope#(321850372193847154).14fa9e76ae5ff70b9f49dbadc6e57d6c_1" -> "__infer_inner_destructor_~X#X#break_scope#(321850372193847154).14fa9e76ae5ff70b9f49dbadc6e57d6c_2" ;
-"__infer_inner_destructor_~X#X#break_scope#(321850372193847154).14fa9e76ae5ff70b9f49dbadc6e57d6c_2" [label="2: Exit break_scope::X::__infer_inner_destructor_~X \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~X#X#break_scope#(17520180356259547384).fa56341fa47a2c5b22d5af69667cafe8_1" -> "__infer_inner_destructor_~X#X#break_scope#(17520180356259547384).fa56341fa47a2c5b22d5af69667cafe8_2" ;
+"__infer_inner_destructor_~X#X#break_scope#(17520180356259547384).fa56341fa47a2c5b22d5af69667cafe8_2" [label="2: Exit break_scope::X::__infer_inner_destructor_~X \n  " color=yellow style=filled]
 	
 
-"~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_1" [label="1: Start break_scope::X::~X\nFormals:  this:break_scope::X*\nLocals:  \n  " color=yellow style=filled]
+"~X#X#break_scope#(17520180356259547384).f33b078655028356d826a691c750c716_1" [label="1: Start break_scope::X::~X\nFormals:  this:break_scope::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_1" -> "~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_3" ;
-"~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_2" [label="2: Exit break_scope::X::~X \n  " color=yellow style=filled]
+	 "~X#X#break_scope#(17520180356259547384).f33b078655028356d826a691c750c716_1" -> "~X#X#break_scope#(17520180356259547384).f33b078655028356d826a691c750c716_3" ;
+"~X#X#break_scope#(17520180356259547384).f33b078655028356d826a691c750c716_2" [label="2: Exit break_scope::X::~X \n  " color=yellow style=filled]
 	
 
-"~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:break_scope::X* [line 10, column 9]\n  _=*n$0:break_scope::X [line 10, column 9]\n  n$2=_fun_break_scope::X::__infer_inner_destructor_~X(n$0:break_scope::X*) injected [line 10, column 9]\n " shape="box"]
+"~X#X#break_scope#(17520180356259547384).f33b078655028356d826a691c750c716_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:break_scope::X* [line 10, column 9]\n  _=*n$0:break_scope::X [line 10, column 9]\n  n$2=_fun_break_scope::X::__infer_inner_destructor_~X(n$0:break_scope::X*) injected [line 10, column 9]\n " shape="box"]
 	
 
-	 "~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_3" -> "~X#X#break_scope#(321850372193847154).bb0579f8004d4fbf59537d5d55a8dfe9_2" ;
+	 "~X#X#break_scope#(17520180356259547384).f33b078655028356d826a691c750c716_3" -> "~X#X#break_scope#(17520180356259547384).f33b078655028356d826a691c750c716_2" ;
 "operator!=#iterator#break_scope#(15861647440981693631).5a328db1c01702ad115b55855603e1eb_1" [label="1: Start break_scope::iterator::operator!=\nFormals:  this:break_scope::iterator* i2:break_scope::iterator const &\nLocals:  \n  " color=yellow style=filled]
 	
 
@@ -606,75 +606,75 @@ digraph cfg {
 	
 
 	 "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_6" -> "operator*#iterator#break_scope(class break_scope::X)#(4328339407583570703).89adb890a0c29514eda31053987e2050_2" ;
-"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_1" [label="1: Start break_scope::iterator::iterator\nFormals:  this:break_scope::iterator* __param_0:break_scope::iterator const &\nLocals:  \n  " color=yellow style=filled]
+"iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_1" [label="1: Start break_scope::iterator::iterator\nFormals:  this:break_scope::iterator* v:break_scope::vec const * pos:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_1" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_5" ;
-"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_2" [label="2: Exit break_scope::iterator::iterator \n  " color=yellow style=filled]
+	 "iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_1" -> "iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_5" ;
+"iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_2" [label="2: Exit break_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 16, column 8]\n " shape="box"]
+"iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 20, column 52]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" ;
-"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" [label="4:  Constructor Init \n   n$2=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$3=*n$2.vector:break_scope::vec const * [line 16, column 8]\n  *n$1.vector:break_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_3" -> "iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_4" ;
+"iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_4" [label="4:  Constructor Init \n   n$2=*&v:break_scope::vec const * [line 20, column 59]\n  *n$1.vector:break_scope::vec const *=n$2 [line 20, column 52]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_4" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_2" ;
-"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_5" [label="5:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_4" -> "iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_2" ;
+"iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_5" [label="5:  Constructor Init \n   n$3=*&this:break_scope::iterator* [line 20, column 37]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_5" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_6" ;
-"iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_6" [label="6:  Constructor Init \n   n$5=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_5" -> "iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_6" ;
+"iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_6" [label="6:  Constructor Init \n   n$4=*&pos:int [line 20, column 46]\n  *n$3.position:int=n$4 [line 20, column 37]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_6" -> "iterator#iterator#break_scope#{13325232528858742422|constexpr}.df2bdd1dc650d74172db385b1dec541f_3" ;
-"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_1" [label="1: Start break_scope::iterator::iterator\nFormals:  this:break_scope::iterator* v:break_scope::vec const * pos:int\nLocals:  \n  " color=yellow style=filled]
+	 "iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_6" -> "iterator#iterator#break_scope(class break_scope::vec)#{10700556332998750370}.ac576904898fa25037c8ca7380076caf_3" ;
+"iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_1" [label="1: Start break_scope::iterator::iterator\nFormals:  this:break_scope::iterator* __param_0:break_scope::iterator const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_1" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_5" ;
-"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_2" [label="2: Exit break_scope::iterator::iterator \n  " color=yellow style=filled]
+	 "iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_1" -> "iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_5" ;
+"iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_2" [label="2: Exit break_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 20, column 52]\n " shape="box"]
+"iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" ;
-"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" [label="4:  Constructor Init \n   n$2=*&v:break_scope::vec const * [line 20, column 59]\n  *n$1.vector:break_scope::vec const *=n$2 [line 20, column 52]\n " shape="box"]
+	 "iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_3" -> "iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_4" ;
+"iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_4" [label="4:  Constructor Init \n   n$2=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$3=*n$2.vector:break_scope::vec const * [line 16, column 8]\n  *n$1.vector:break_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_4" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_2" ;
-"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_5" [label="5:  Constructor Init \n   n$3=*&this:break_scope::iterator* [line 20, column 37]\n " shape="box"]
+	 "iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_4" -> "iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_2" ;
+"iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_5" [label="5:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_5" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_6" ;
-"iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_6" [label="6:  Constructor Init \n   n$4=*&pos:int [line 20, column 46]\n  *n$3.position:int=n$4 [line 20, column 37]\n " shape="box"]
+	 "iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_5" -> "iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_6" ;
+"iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_6" [label="6:  Constructor Init \n   n$5=*&__param_0:break_scope::iterator const & [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_6" -> "iterator#iterator#break_scope(class break_scope::vec)#{16869174875139255019}.5bff0f8e93c62e2b970e10e384e3b9df_3" ;
-"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_1" [label="1: Start break_scope::iterator::iterator\nFormals:  this:break_scope::iterator* __param_0:break_scope::iterator&\nLocals:  \n  " color=yellow style=filled]
+	 "iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_6" -> "iterator#iterator#break_scope#{15166647371046856559|constexpr}.5d1dc4e4a90597efa52c6bfcf5e11038_3" ;
+"iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_1" [label="1: Start break_scope::iterator::iterator\nFormals:  this:break_scope::iterator* __param_0:break_scope::iterator&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_1" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_5" ;
-"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_2" [label="2: Exit break_scope::iterator::iterator \n  " color=yellow style=filled]
+	 "iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_1" -> "iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_5" ;
+"iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_2" [label="2: Exit break_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 16, column 8]\n " shape="box"]
+"iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::iterator* [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" ;
-"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" [label="4:  Constructor Init \n   n$2=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$3=*n$2.vector:break_scope::vec const * [line 16, column 8]\n  *n$1.vector:break_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_3" -> "iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_4" ;
+"iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_4" [label="4:  Constructor Init \n   n$2=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$3=*n$2.vector:break_scope::vec const * [line 16, column 8]\n  *n$1.vector:break_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_4" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_2" ;
-"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_5" [label="5:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_4" -> "iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_2" ;
+"iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_5" [label="5:  Constructor Init \n   n$4=*&this:break_scope::iterator* [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_5" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_6" ;
-"iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_6" [label="6:  Constructor Init \n   n$5=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_5" -> "iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_6" ;
+"iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_6" [label="6:  Constructor Init \n   n$5=*&__param_0:break_scope::iterator& [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_6" -> "iterator#iterator#break_scope#{3654715460407933162|constexpr}.a69cb17d37da9b3963eb407e0dec4509_3" ;
+	 "iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_6" -> "iterator#iterator#break_scope#{4422062655324687513|constexpr}.1a08ab2c5b22f1a0e6e1f83d71544d50_3" ;
 "get#vec#break_scope(class break_scope::X)#(1283787980840570343).f29590f18442006705e4b1df63322511_1" [label="1: Start break_scope::vec::get\nFormals:  this:break_scope::vec* pos:int __return_param:break_scope::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
@@ -740,37 +740,37 @@ digraph cfg {
 	
 
 	 "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_6" -> "begin#vec#break_scope(class break_scope::iterator)#(5557509884489875894).5dac1fcfbf012c7c4e9ccd6f67cbd1ce_2" ;
-"vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_1" [label="1: Start break_scope::vec::vec\nFormals:  this:break_scope::vec*\nLocals:  \n  " color=yellow style=filled]
+"vec#vec#break_scope#{6843160992256408703}.7e7e4e1e0c7c23e285a1204757d0f81d_1" [label="1: Start break_scope::vec::vec\nFormals:  this:break_scope::vec*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_1" -> "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" ;
-"vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_2" [label="2: Exit break_scope::vec::vec \n  " color=yellow style=filled]
+	 "vec#vec#break_scope#{6843160992256408703}.7e7e4e1e0c7c23e285a1204757d0f81d_1" -> "vec#vec#break_scope#{6843160992256408703}.7e7e4e1e0c7c23e285a1204757d0f81d_3" ;
+"vec#vec#break_scope#{6843160992256408703}.7e7e4e1e0c7c23e285a1204757d0f81d_2" [label="2: Exit break_scope::vec::vec \n  " color=yellow style=filled]
 	
 
-"vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::vec* [line 33, column 3]\n " shape="box"]
+"vec#vec#break_scope#{6843160992256408703}.7e7e4e1e0c7c23e285a1204757d0f81d_3" [label="3:  Constructor Init \n   n$1=*&this:break_scope::vec* [line 33, column 3]\n " shape="box"]
 	
 
-	 "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_3" -> "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_4" ;
-"vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_4" [label="4:  Constructor Init \n   n$2=_fun_break_scope::X::X(n$1._data:break_scope::X[10*1](*)) [line 33, column 3]\n " shape="box"]
+	 "vec#vec#break_scope#{6843160992256408703}.7e7e4e1e0c7c23e285a1204757d0f81d_3" -> "vec#vec#break_scope#{6843160992256408703}.7e7e4e1e0c7c23e285a1204757d0f81d_4" ;
+"vec#vec#break_scope#{6843160992256408703}.7e7e4e1e0c7c23e285a1204757d0f81d_4" [label="4:  Constructor Init \n   n$2=_fun_break_scope::X::X(n$1._data:break_scope::X[10*1](*)) [line 33, column 3]\n " shape="box"]
 	
 
-	 "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_4" -> "vec#vec#break_scope#{8713994320815093146}.a7abdfa106915d365eda869e8e136554_2" ;
-"__infer_inner_destructor_~vec#vec#break_scope#(2726327876410250530).f113a7960f096ab5aa59d07ce9fbcbbe_1" [label="1: Start break_scope::vec::__infer_inner_destructor_~vec\nFormals:  this:break_scope::vec*\nLocals:  \n  " color=yellow style=filled]
+	 "vec#vec#break_scope#{6843160992256408703}.7e7e4e1e0c7c23e285a1204757d0f81d_4" -> "vec#vec#break_scope#{6843160992256408703}.7e7e4e1e0c7c23e285a1204757d0f81d_2" ;
+"__infer_inner_destructor_~vec#vec#break_scope#(1477913786766399144).cb1973a5e118d6db4763f496b3486d41_1" [label="1: Start break_scope::vec::__infer_inner_destructor_~vec\nFormals:  this:break_scope::vec*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~vec#vec#break_scope#(2726327876410250530).f113a7960f096ab5aa59d07ce9fbcbbe_1" -> "__infer_inner_destructor_~vec#vec#break_scope#(2726327876410250530).f113a7960f096ab5aa59d07ce9fbcbbe_2" ;
-"__infer_inner_destructor_~vec#vec#break_scope#(2726327876410250530).f113a7960f096ab5aa59d07ce9fbcbbe_2" [label="2: Exit break_scope::vec::__infer_inner_destructor_~vec \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~vec#vec#break_scope#(1477913786766399144).cb1973a5e118d6db4763f496b3486d41_1" -> "__infer_inner_destructor_~vec#vec#break_scope#(1477913786766399144).cb1973a5e118d6db4763f496b3486d41_2" ;
+"__infer_inner_destructor_~vec#vec#break_scope#(1477913786766399144).cb1973a5e118d6db4763f496b3486d41_2" [label="2: Exit break_scope::vec::__infer_inner_destructor_~vec \n  " color=yellow style=filled]
 	
 
-"~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_1" [label="1: Start break_scope::vec::~vec\nFormals:  this:break_scope::vec*\nLocals:  \n  " color=yellow style=filled]
+"~vec#vec#break_scope#(1477913786766399144).3440ed4baf49b179793d6163ac2d1b06_1" [label="1: Start break_scope::vec::~vec\nFormals:  this:break_scope::vec*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_1" -> "~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_3" ;
-"~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_2" [label="2: Exit break_scope::vec::~vec \n  " color=yellow style=filled]
+	 "~vec#vec#break_scope#(1477913786766399144).3440ed4baf49b179793d6163ac2d1b06_1" -> "~vec#vec#break_scope#(1477913786766399144).3440ed4baf49b179793d6163ac2d1b06_3" ;
+"~vec#vec#break_scope#(1477913786766399144).3440ed4baf49b179793d6163ac2d1b06_2" [label="2: Exit break_scope::vec::~vec \n  " color=yellow style=filled]
 	
 
-"~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:break_scope::vec* [line 32, column 8]\n  _=*n$0:break_scope::vec [line 32, column 8]\n  n$2=_fun_break_scope::vec::__infer_inner_destructor_~vec(n$0:break_scope::vec*) injected [line 32, column 8]\n " shape="box"]
+"~vec#vec#break_scope#(1477913786766399144).3440ed4baf49b179793d6163ac2d1b06_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:break_scope::vec* [line 32, column 8]\n  _=*n$0:break_scope::vec [line 32, column 8]\n  n$2=_fun_break_scope::vec::__infer_inner_destructor_~vec(n$0:break_scope::vec*) injected [line 32, column 8]\n " shape="box"]
 	
 
-	 "~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_3" -> "~vec#vec#break_scope#(2726327876410250530).6af158139cecaa31993b3ce213ac0fe6_2" ;
+	 "~vec#vec#break_scope#(1477913786766399144).3440ed4baf49b179793d6163ac2d1b06_3" -> "~vec#vec#break_scope#(1477913786766399144).3440ed4baf49b179793d6163ac2d1b06_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot
index bf633d18d..716c653c0 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/call_on_delete.cpp.dot
@@ -22,22 +22,22 @@ digraph cfg {
 	
 
 	 "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_3" -> "deleteX(class X)#8359832236310221055.de7d98d32d68fd20c6aec48045fd1c8e_2" ;
-"__infer_inner_destructor_~X#X#(9850251229546392500).d48deae5dbd403872895c6ef0bdaa126_1" [label="1: Start X::__infer_inner_destructor_~X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
+"__infer_inner_destructor_~X#X#(10975959821506117086).9760ffe42533c89383414d69fcddd1ae_1" [label="1: Start X::__infer_inner_destructor_~X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~X#X#(9850251229546392500).d48deae5dbd403872895c6ef0bdaa126_1" -> "__infer_inner_destructor_~X#X#(9850251229546392500).d48deae5dbd403872895c6ef0bdaa126_2" ;
-"__infer_inner_destructor_~X#X#(9850251229546392500).d48deae5dbd403872895c6ef0bdaa126_2" [label="2: Exit X::__infer_inner_destructor_~X \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~X#X#(10975959821506117086).9760ffe42533c89383414d69fcddd1ae_1" -> "__infer_inner_destructor_~X#X#(10975959821506117086).9760ffe42533c89383414d69fcddd1ae_2" ;
+"__infer_inner_destructor_~X#X#(10975959821506117086).9760ffe42533c89383414d69fcddd1ae_2" [label="2: Exit X::__infer_inner_destructor_~X \n  " color=yellow style=filled]
 	
 
-"~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_1" [label="1: Start X::~X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
+"~X#X#(10975959821506117086).8b5badc8db794e783b6635ae5a3f588b_1" [label="1: Start X::~X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_1" -> "~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_3" ;
-"~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_2" [label="2: Exit X::~X \n  " color=yellow style=filled]
+	 "~X#X#(10975959821506117086).8b5badc8db794e783b6635ae5a3f588b_1" -> "~X#X#(10975959821506117086).8b5badc8db794e783b6635ae5a3f588b_3" ;
+"~X#X#(10975959821506117086).8b5badc8db794e783b6635ae5a3f588b_2" [label="2: Exit X::~X \n  " color=yellow style=filled]
 	
 
-"~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:X* [line 9, column 9]\n  _=*n$0:X [line 9, column 9]\n  n$2=_fun_X::__infer_inner_destructor_~X(n$0:X*) injected [line 9, column 9]\n " shape="box"]
+"~X#X#(10975959821506117086).8b5badc8db794e783b6635ae5a3f588b_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:X* [line 9, column 9]\n  _=*n$0:X [line 9, column 9]\n  n$2=_fun_X::__infer_inner_destructor_~X(n$0:X*) injected [line 9, column 9]\n " shape="box"]
 	
 
-	 "~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_3" -> "~X#X#(9850251229546392500).92228f0925803df4b24e5d788ad29673_2" ;
+	 "~X#X#(10975959821506117086).8b5badc8db794e783b6635ae5a3f588b_3" -> "~X#X#(10975959821506117086).8b5badc8db794e783b6635ae5a3f588b_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/continue_scope.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/continue_scope.cpp.dot
index 4020a8b54..4f3d2c630 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/continue_scope.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/continue_scope.cpp.dot
@@ -419,38 +419,38 @@ digraph cfg {
 	
 
 	 "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_13" -> "test_while3#continue_scope#1176125085634537673.a024bcf519539ef1deac237c06a02a78_5" ;
-"X#X#continue_scope#{3409116780571095996|constexpr}.c8d6a2b86adba9628fb048dcdc417f93_1" [label="1: Start continue_scope::X::X\nFormals:  this:continue_scope::X* __param_0:continue_scope::X const &\nLocals:  \n  " color=yellow style=filled]
+"X#X#continue_scope#{6980962160618076226|constexpr}.93a08564ab8c2fcc4b6385f4de5f2acd_1" [label="1: Start continue_scope::X::X\nFormals:  this:continue_scope::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#continue_scope#{3409116780571095996|constexpr}.c8d6a2b86adba9628fb048dcdc417f93_1" -> "X#X#continue_scope#{3409116780571095996|constexpr}.c8d6a2b86adba9628fb048dcdc417f93_2" ;
-"X#X#continue_scope#{3409116780571095996|constexpr}.c8d6a2b86adba9628fb048dcdc417f93_2" [label="2: Exit continue_scope::X::X \n  " color=yellow style=filled]
+	 "X#X#continue_scope#{6980962160618076226|constexpr}.93a08564ab8c2fcc4b6385f4de5f2acd_1" -> "X#X#continue_scope#{6980962160618076226|constexpr}.93a08564ab8c2fcc4b6385f4de5f2acd_2" ;
+"X#X#continue_scope#{6980962160618076226|constexpr}.93a08564ab8c2fcc4b6385f4de5f2acd_2" [label="2: Exit continue_scope::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#continue_scope#{4988003876514960391|constexpr}.1f40e6165a04ac2ba6a599134cfea1db_1" [label="1: Start continue_scope::X::X\nFormals:  this:continue_scope::X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#continue_scope#{7073463255755958209|constexpr}.55bb3b213fe110ff241217115eddd17f_1" [label="1: Start continue_scope::X::X\nFormals:  this:continue_scope::X* __param_0:continue_scope::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#continue_scope#{4988003876514960391|constexpr}.1f40e6165a04ac2ba6a599134cfea1db_1" -> "X#X#continue_scope#{4988003876514960391|constexpr}.1f40e6165a04ac2ba6a599134cfea1db_2" ;
-"X#X#continue_scope#{4988003876514960391|constexpr}.1f40e6165a04ac2ba6a599134cfea1db_2" [label="2: Exit continue_scope::X::X \n  " color=yellow style=filled]
+	 "X#X#continue_scope#{7073463255755958209|constexpr}.55bb3b213fe110ff241217115eddd17f_1" -> "X#X#continue_scope#{7073463255755958209|constexpr}.55bb3b213fe110ff241217115eddd17f_2" ;
+"X#X#continue_scope#{7073463255755958209|constexpr}.55bb3b213fe110ff241217115eddd17f_2" [label="2: Exit continue_scope::X::X \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~X#X#continue_scope#(14106261246415748043).7b99c403359c6d4efc163f4292ca75da_1" [label="1: Start continue_scope::X::__infer_inner_destructor_~X\nFormals:  this:continue_scope::X*\nLocals:  \n  " color=yellow style=filled]
+"__infer_inner_destructor_~X#X#continue_scope#(15469534718766326333).a64668d194527e51f8b71c13bb86a597_1" [label="1: Start continue_scope::X::__infer_inner_destructor_~X\nFormals:  this:continue_scope::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~X#X#continue_scope#(14106261246415748043).7b99c403359c6d4efc163f4292ca75da_1" -> "__infer_inner_destructor_~X#X#continue_scope#(14106261246415748043).7b99c403359c6d4efc163f4292ca75da_2" ;
-"__infer_inner_destructor_~X#X#continue_scope#(14106261246415748043).7b99c403359c6d4efc163f4292ca75da_2" [label="2: Exit continue_scope::X::__infer_inner_destructor_~X \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~X#X#continue_scope#(15469534718766326333).a64668d194527e51f8b71c13bb86a597_1" -> "__infer_inner_destructor_~X#X#continue_scope#(15469534718766326333).a64668d194527e51f8b71c13bb86a597_2" ;
+"__infer_inner_destructor_~X#X#continue_scope#(15469534718766326333).a64668d194527e51f8b71c13bb86a597_2" [label="2: Exit continue_scope::X::__infer_inner_destructor_~X \n  " color=yellow style=filled]
 	
 
-"~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_1" [label="1: Start continue_scope::X::~X\nFormals:  this:continue_scope::X*\nLocals:  \n  " color=yellow style=filled]
+"~X#X#continue_scope#(15469534718766326333).9fa422dd939a9f30f1c5eb6a7ca025e6_1" [label="1: Start continue_scope::X::~X\nFormals:  this:continue_scope::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_1" -> "~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_3" ;
-"~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_2" [label="2: Exit continue_scope::X::~X \n  " color=yellow style=filled]
+	 "~X#X#continue_scope#(15469534718766326333).9fa422dd939a9f30f1c5eb6a7ca025e6_1" -> "~X#X#continue_scope#(15469534718766326333).9fa422dd939a9f30f1c5eb6a7ca025e6_3" ;
+"~X#X#continue_scope#(15469534718766326333).9fa422dd939a9f30f1c5eb6a7ca025e6_2" [label="2: Exit continue_scope::X::~X \n  " color=yellow style=filled]
 	
 
-"~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:continue_scope::X* [line 10, column 9]\n  _=*n$0:continue_scope::X [line 10, column 9]\n  n$2=_fun_continue_scope::X::__infer_inner_destructor_~X(n$0:continue_scope::X*) injected [line 10, column 9]\n " shape="box"]
+"~X#X#continue_scope#(15469534718766326333).9fa422dd939a9f30f1c5eb6a7ca025e6_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:continue_scope::X* [line 10, column 9]\n  _=*n$0:continue_scope::X [line 10, column 9]\n  n$2=_fun_continue_scope::X::__infer_inner_destructor_~X(n$0:continue_scope::X*) injected [line 10, column 9]\n " shape="box"]
 	
 
-	 "~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_3" -> "~X#X#continue_scope#(14106261246415748043).bee8da02915b57fe8c8e01c9b731311d_2" ;
+	 "~X#X#continue_scope#(15469534718766326333).9fa422dd939a9f30f1c5eb6a7ca025e6_3" -> "~X#X#continue_scope#(15469534718766326333).9fa422dd939a9f30f1c5eb6a7ca025e6_2" ;
 "operator*#iterator#continue_scope(class continue_scope::X)#(10976315504449545146).6f0a140275409bbf42ae1dbc8842f6af_1" [label="1: Start continue_scope::iterator::operator*\nFormals:  this:continue_scope::iterator* __return_param:continue_scope::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::X const  \n  " color=yellow style=filled]
 	
 
@@ -533,75 +533,75 @@ digraph cfg {
 	
 
 	 "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_6" -> "operator++#iterator#continue_scope(class continue_scope::iterator)#(16434574593791982090).65ed5567b5dc83cc8a9cab1252f670aa_3" ;
-"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_1" [label="1: Start continue_scope::iterator::iterator\nFormals:  this:continue_scope::iterator* __param_0:continue_scope::iterator&\nLocals:  \n  " color=yellow style=filled]
+"iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_1" [label="1: Start continue_scope::iterator::iterator\nFormals:  this:continue_scope::iterator* v:continue_scope::vec const * pos:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_1" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_5" ;
-"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_2" [label="2: Exit continue_scope::iterator::iterator \n  " color=yellow style=filled]
+	 "iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_1" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_5" ;
+"iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_2" [label="2: Exit continue_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 16, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 20, column 52]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" ;
-"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" [label="4:  Constructor Init \n   n$2=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$3=*n$2.vector:continue_scope::vec const * [line 16, column 8]\n  *n$1.vector:continue_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_3" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_4" ;
+"iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_4" [label="4:  Constructor Init \n   n$2=*&v:continue_scope::vec const * [line 20, column 59]\n  *n$1.vector:continue_scope::vec const *=n$2 [line 20, column 52]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_4" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_2" ;
-"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_5" [label="5:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_4" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_2" ;
+"iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_5" [label="5:  Constructor Init \n   n$3=*&this:continue_scope::iterator* [line 20, column 37]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_5" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_6" ;
-"iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_6" [label="6:  Constructor Init \n   n$5=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_5" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_6" ;
+"iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_6" [label="6:  Constructor Init \n   n$4=*&pos:int [line 20, column 46]\n  *n$3.position:int=n$4 [line 20, column 37]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_6" -> "iterator#iterator#continue_scope#{10809914205998631191|constexpr}.3824b12e843bd919018b65d60747271f_3" ;
-"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_1" [label="1: Start continue_scope::iterator::iterator\nFormals:  this:continue_scope::iterator* v:continue_scope::vec const * pos:int\nLocals:  \n  " color=yellow style=filled]
+	 "iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_6" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{1055772979469092753}.5297b6304aaa804fb97d8c9c3499da94_3" ;
+"iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_1" [label="1: Start continue_scope::iterator::iterator\nFormals:  this:continue_scope::iterator* __param_0:continue_scope::iterator const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_1" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_5" ;
-"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_2" [label="2: Exit continue_scope::iterator::iterator \n  " color=yellow style=filled]
+	 "iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_1" -> "iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_5" ;
+"iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_2" [label="2: Exit continue_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 20, column 52]\n " shape="box"]
+"iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" ;
-"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" [label="4:  Constructor Init \n   n$2=*&v:continue_scope::vec const * [line 20, column 59]\n  *n$1.vector:continue_scope::vec const *=n$2 [line 20, column 52]\n " shape="box"]
+	 "iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_3" -> "iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_4" ;
+"iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_4" [label="4:  Constructor Init \n   n$2=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$3=*n$2.vector:continue_scope::vec const * [line 16, column 8]\n  *n$1.vector:continue_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_4" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_2" ;
-"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_5" [label="5:  Constructor Init \n   n$3=*&this:continue_scope::iterator* [line 20, column 37]\n " shape="box"]
+	 "iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_4" -> "iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_2" ;
+"iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_5" [label="5:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_5" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_6" ;
-"iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_6" [label="6:  Constructor Init \n   n$4=*&pos:int [line 20, column 46]\n  *n$3.position:int=n$4 [line 20, column 37]\n " shape="box"]
+	 "iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_5" -> "iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_6" ;
+"iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_6" [label="6:  Constructor Init \n   n$5=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_6" -> "iterator#iterator#continue_scope(class continue_scope::vec)#{17152205201271404012}.bc541607d571f16de19f1a4ee9d89b7b_3" ;
-"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_1" [label="1: Start continue_scope::iterator::iterator\nFormals:  this:continue_scope::iterator* __param_0:continue_scope::iterator const &\nLocals:  \n  " color=yellow style=filled]
+	 "iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_6" -> "iterator#iterator#continue_scope#{14404461323337206352|constexpr}.34c38ef9047874025a012b673af5c5a3_3" ;
+"iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_1" [label="1: Start continue_scope::iterator::iterator\nFormals:  this:continue_scope::iterator* __param_0:continue_scope::iterator&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_1" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_5" ;
-"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_2" [label="2: Exit continue_scope::iterator::iterator \n  " color=yellow style=filled]
+	 "iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_1" -> "iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_5" ;
+"iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_2" [label="2: Exit continue_scope::iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 16, column 8]\n " shape="box"]
+"iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::iterator* [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" ;
-"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" [label="4:  Constructor Init \n   n$2=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$3=*n$2.vector:continue_scope::vec const * [line 16, column 8]\n  *n$1.vector:continue_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_3" -> "iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_4" ;
+"iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_4" [label="4:  Constructor Init \n   n$2=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$3=*n$2.vector:continue_scope::vec const * [line 16, column 8]\n  *n$1.vector:continue_scope::vec const *=n$3 [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_4" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_2" ;
-"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_5" [label="5:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_4" -> "iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_2" ;
+"iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_5" [label="5:  Constructor Init \n   n$4=*&this:continue_scope::iterator* [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_5" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_6" ;
-"iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_6" [label="6:  Constructor Init \n   n$5=*&__param_0:continue_scope::iterator const & [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
+	 "iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_5" -> "iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_6" ;
+"iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_6" [label="6:  Constructor Init \n   n$5=*&__param_0:continue_scope::iterator& [line 16, column 8]\n  n$6=*n$5.position:int [line 16, column 8]\n  *n$4.position:int=n$6 [line 16, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_6" -> "iterator#iterator#continue_scope#{5205818338773724773|constexpr}.befe58b6f79cfdaaec28cf6af78711d5_3" ;
+	 "iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_6" -> "iterator#iterator#continue_scope#{45454584545775676|constexpr}.1412ff03a340a711ee832e78d977c1db_3" ;
 "begin#vec#continue_scope(class continue_scope::iterator)#(10867355481694456603).8c0551e386b9f2c25bf3629672b303c4_1" [label="1: Start continue_scope::vec::begin\nFormals:  this:continue_scope::vec* __return_param:continue_scope::iterator*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:continue_scope::iterator \n  " color=yellow style=filled]
 	
 
@@ -667,37 +667,37 @@ digraph cfg {
 	
 
 	 "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_6" -> "end#vec#continue_scope(class continue_scope::iterator)#(4225103001970544933).15b63d21cc3cccf91200fcac42652775_2" ;
-"vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_1" [label="1: Start continue_scope::vec::vec\nFormals:  this:continue_scope::vec*\nLocals:  \n  " color=yellow style=filled]
+"vec#vec#continue_scope#{16884932625975136990}.07edc09819b677f7890b8a010b6804ce_1" [label="1: Start continue_scope::vec::vec\nFormals:  this:continue_scope::vec*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_1" -> "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" ;
-"vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_2" [label="2: Exit continue_scope::vec::vec \n  " color=yellow style=filled]
+	 "vec#vec#continue_scope#{16884932625975136990}.07edc09819b677f7890b8a010b6804ce_1" -> "vec#vec#continue_scope#{16884932625975136990}.07edc09819b677f7890b8a010b6804ce_3" ;
+"vec#vec#continue_scope#{16884932625975136990}.07edc09819b677f7890b8a010b6804ce_2" [label="2: Exit continue_scope::vec::vec \n  " color=yellow style=filled]
 	
 
-"vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::vec* [line 33, column 3]\n " shape="box"]
+"vec#vec#continue_scope#{16884932625975136990}.07edc09819b677f7890b8a010b6804ce_3" [label="3:  Constructor Init \n   n$1=*&this:continue_scope::vec* [line 33, column 3]\n " shape="box"]
 	
 
-	 "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_3" -> "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_4" ;
-"vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_4" [label="4:  Constructor Init \n   n$2=_fun_continue_scope::X::X(n$1._data:continue_scope::X[10*1](*)) [line 33, column 3]\n " shape="box"]
+	 "vec#vec#continue_scope#{16884932625975136990}.07edc09819b677f7890b8a010b6804ce_3" -> "vec#vec#continue_scope#{16884932625975136990}.07edc09819b677f7890b8a010b6804ce_4" ;
+"vec#vec#continue_scope#{16884932625975136990}.07edc09819b677f7890b8a010b6804ce_4" [label="4:  Constructor Init \n   n$2=_fun_continue_scope::X::X(n$1._data:continue_scope::X[10*1](*)) [line 33, column 3]\n " shape="box"]
 	
 
-	 "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_4" -> "vec#vec#continue_scope#{15014380772393274563}.0db26bae10e0d7702598e02aede0544b_2" ;
-"__infer_inner_destructor_~vec#vec#continue_scope#(10360929843329979119).03b608737079bc7a6c659c5062560447_1" [label="1: Start continue_scope::vec::__infer_inner_destructor_~vec\nFormals:  this:continue_scope::vec*\nLocals:  \n  " color=yellow style=filled]
+	 "vec#vec#continue_scope#{16884932625975136990}.07edc09819b677f7890b8a010b6804ce_4" -> "vec#vec#continue_scope#{16884932625975136990}.07edc09819b677f7890b8a010b6804ce_2" ;
+"__infer_inner_destructor_~vec#vec#continue_scope#(11494537326825257729).7d2ec8f2b4f32ffc3efde96b56425721_1" [label="1: Start continue_scope::vec::__infer_inner_destructor_~vec\nFormals:  this:continue_scope::vec*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~vec#vec#continue_scope#(10360929843329979119).03b608737079bc7a6c659c5062560447_1" -> "__infer_inner_destructor_~vec#vec#continue_scope#(10360929843329979119).03b608737079bc7a6c659c5062560447_2" ;
-"__infer_inner_destructor_~vec#vec#continue_scope#(10360929843329979119).03b608737079bc7a6c659c5062560447_2" [label="2: Exit continue_scope::vec::__infer_inner_destructor_~vec \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~vec#vec#continue_scope#(11494537326825257729).7d2ec8f2b4f32ffc3efde96b56425721_1" -> "__infer_inner_destructor_~vec#vec#continue_scope#(11494537326825257729).7d2ec8f2b4f32ffc3efde96b56425721_2" ;
+"__infer_inner_destructor_~vec#vec#continue_scope#(11494537326825257729).7d2ec8f2b4f32ffc3efde96b56425721_2" [label="2: Exit continue_scope::vec::__infer_inner_destructor_~vec \n  " color=yellow style=filled]
 	
 
-"~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_1" [label="1: Start continue_scope::vec::~vec\nFormals:  this:continue_scope::vec*\nLocals:  \n  " color=yellow style=filled]
+"~vec#vec#continue_scope#(11494537326825257729).e5b239711eca6d0bba9997ac2dff7ce5_1" [label="1: Start continue_scope::vec::~vec\nFormals:  this:continue_scope::vec*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_1" -> "~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_3" ;
-"~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_2" [label="2: Exit continue_scope::vec::~vec \n  " color=yellow style=filled]
+	 "~vec#vec#continue_scope#(11494537326825257729).e5b239711eca6d0bba9997ac2dff7ce5_1" -> "~vec#vec#continue_scope#(11494537326825257729).e5b239711eca6d0bba9997ac2dff7ce5_3" ;
+"~vec#vec#continue_scope#(11494537326825257729).e5b239711eca6d0bba9997ac2dff7ce5_2" [label="2: Exit continue_scope::vec::~vec \n  " color=yellow style=filled]
 	
 
-"~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:continue_scope::vec* [line 32, column 8]\n  _=*n$0:continue_scope::vec [line 32, column 8]\n  n$2=_fun_continue_scope::vec::__infer_inner_destructor_~vec(n$0:continue_scope::vec*) injected [line 32, column 8]\n " shape="box"]
+"~vec#vec#continue_scope#(11494537326825257729).e5b239711eca6d0bba9997ac2dff7ce5_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:continue_scope::vec* [line 32, column 8]\n  _=*n$0:continue_scope::vec [line 32, column 8]\n  n$2=_fun_continue_scope::vec::__infer_inner_destructor_~vec(n$0:continue_scope::vec*) injected [line 32, column 8]\n " shape="box"]
 	
 
-	 "~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_3" -> "~vec#vec#continue_scope#(10360929843329979119).4ca99321ca697a550551ca058254a138_2" ;
+	 "~vec#vec#continue_scope#(11494537326825257729).e5b239711eca6d0bba9997ac2dff7ce5_3" -> "~vec#vec#continue_scope#(11494537326825257729).e5b239711eca6d0bba9997ac2dff7ce5_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/destructor_bases.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/destructor_bases.cpp.dot
index 9afaf5417..8a53a2c9c 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/destructor_bases.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/destructor_bases.cpp.dot
@@ -1,334 +1,334 @@
 /* @generated */
 digraph cfg {
-"A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_1" [label="1: Start A::A\nFormals:  this:A*\nLocals:  \n  " color=yellow style=filled]
+"A#A#{16649858826465904026}.401b4dff8916881d5d949fe980219334_1" [label="1: Start A::A\nFormals:  this:A*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_1" -> "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" ;
-"A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_2" [label="2: Exit A::A \n  " color=yellow style=filled]
+	 "A#A#{16649858826465904026}.401b4dff8916881d5d949fe980219334_1" -> "A#A#{16649858826465904026}.401b4dff8916881d5d949fe980219334_3" ;
+"A#A#{16649858826465904026}.401b4dff8916881d5d949fe980219334_2" [label="2: Exit A::A \n  " color=yellow style=filled]
 	
 
-"A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" [label="3:  Constructor Init \n   n$1=*&this:A* [line 14, column 7]\n " shape="box"]
+"A#A#{16649858826465904026}.401b4dff8916881d5d949fe980219334_3" [label="3:  Constructor Init \n   n$1=*&this:A* [line 14, column 7]\n " shape="box"]
 	
 
-	 "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_3" -> "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_4" ;
-"A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_4" [label="4:  Constructor Init \n   n$2=_fun_T::T(n$1:A*) [line 14, column 3]\n " shape="box"]
+	 "A#A#{16649858826465904026}.401b4dff8916881d5d949fe980219334_3" -> "A#A#{16649858826465904026}.401b4dff8916881d5d949fe980219334_4" ;
+"A#A#{16649858826465904026}.401b4dff8916881d5d949fe980219334_4" [label="4:  Constructor Init \n   n$2=_fun_T::T(n$1:A*) [line 14, column 3]\n " shape="box"]
 	
 
-	 "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_4" -> "A#A#{14779025497907219583}.17208581fb4c6bbf4d62e29851fb70ab_2" ;
-"__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_1" [label="1: Start A::__infer_inner_destructor_~A\nFormals:  this:A*\nLocals:  \n  " color=yellow style=filled]
+	 "A#A#{16649858826465904026}.401b4dff8916881d5d949fe980219334_4" -> "A#A#{16649858826465904026}.401b4dff8916881d5d949fe980219334_2" ;
+"__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_1" [label="1: Start A::__infer_inner_destructor_~A\nFormals:  this:A*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_1" -> "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_2" ;
-"__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_2" [label="2: Exit A::__infer_inner_destructor_~A \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_1" -> "__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_2" ;
+"__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_2" [label="2: Exit A::__infer_inner_destructor_~A \n  " color=yellow style=filled]
 	
 
-"~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_1" [label="1: Start A::~A\nFormals:  this:A*\nLocals:  \n  " color=yellow style=filled]
+"~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_1" [label="1: Start A::~A\nFormals:  this:A*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_1" -> "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" ;
-"~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_2" [label="2: Exit A::~A \n  " color=yellow style=filled]
+	 "~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_1" -> "~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_3" ;
+"~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_2" [label="2: Exit A::~A \n  " color=yellow style=filled]
 	
 
-"~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:A* [line 15, column 8]\n  _=*n$0:A [line 15, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:A*) injected [line 15, column 8]\n  _=*n$0:A [line 15, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:A*) injected [line 15, column 8]\n " shape="box"]
+"~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:A* [line 15, column 8]\n  _=*n$0:A [line 15, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:A*) injected [line 15, column 8]\n  _=*n$0:A [line 15, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:A*) injected [line 15, column 8]\n " shape="box"]
 	
 
-	 "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" -> "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_2" ;
-"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_1" [label="1: Start B::B\nFormals:  this:B*\nLocals:  \n  " color=yellow style=filled]
+	 "~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_3" -> "~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_2" ;
+"B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_1" [label="1: Start B::B\nFormals:  this:B*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_1" -> "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_5" ;
-"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_2" [label="2: Exit B::B \n  " color=yellow style=filled]
+	 "B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_1" -> "B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_5" ;
+"B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_2" [label="2: Exit B::B \n  " color=yellow style=filled]
 	
 
-"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 19, column 3]\n " shape="box"]
+"B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 19, column 3]\n " shape="box"]
 	
 
-	 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" -> "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" ;
-"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" [label="4:  Constructor Init \n   n$2=_fun_A::A(n$1:B*) [line 19, column 3]\n " shape="box"]
+	 "B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_3" -> "B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_4" ;
+"B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_4" [label="4:  Constructor Init \n   n$2=_fun_A::A(n$1:B*) [line 19, column 3]\n " shape="box"]
 	
 
-	 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_4" -> "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_2" ;
-"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_5" [label="5:  Constructor Init \n   n$3=*&this:B* [line 19, column 7]\n " shape="box"]
+	 "B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_4" -> "B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_2" ;
+"B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_5" [label="5:  Constructor Init \n   n$3=*&this:B* [line 19, column 7]\n " shape="box"]
 	
 
-	 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_5" -> "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_6" ;
-"B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_6" [label="6:  Constructor Init \n   n$4=_fun_T::T(n$3:B*) [line 19, column 3]\n " shape="box"]
+	 "B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_5" -> "B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_6" ;
+"B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_6" [label="6:  Constructor Init \n   n$4=_fun_T::T(n$3:B*) [line 19, column 3]\n " shape="box"]
 	
 
-	 "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_6" -> "B#B#{10798876524598897542}.3b10fa64f3322f2c8bfbde72c7a0e4a6_3" ;
-"__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_1" [label="1: Start B::__infer_inner_destructor_~B\nFormals:  this:B*\nLocals:  \n  " color=yellow style=filled]
+	 "B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_6" -> "B#B#{8928078380412315851}.724833206444e2929608a2c41602c9f8_3" ;
+"__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_1" [label="1: Start B::__infer_inner_destructor_~B\nFormals:  this:B*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_1" -> "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_2" ;
-"__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_2" [label="2: Exit B::__infer_inner_destructor_~B \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_1" -> "__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_2" ;
+"__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_2" [label="2: Exit B::__infer_inner_destructor_~B \n  " color=yellow style=filled]
 	
 
-"~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_1" [label="1: Start B::~B\nFormals:  this:B*\nLocals:  \n  " color=yellow style=filled]
+"~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_1" [label="1: Start B::~B\nFormals:  this:B*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_1" -> "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" ;
-"~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_2" [label="2: Exit B::~B \n  " color=yellow style=filled]
+	 "~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_1" -> "~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_3" ;
+"~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_2" [label="2: Exit B::~B \n  " color=yellow style=filled]
 	
 
-"~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:B* [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$6=_fun_B::__infer_inner_destructor_~B(n$0:B*) injected [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:B*) injected [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:B*) injected [line 20, column 8]\n " shape="box"]
+"~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:B* [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$6=_fun_B::__infer_inner_destructor_~B(n$0:B*) injected [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:B*) injected [line 20, column 8]\n  _=*n$0:B [line 20, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:B*) injected [line 20, column 8]\n " shape="box"]
 	
 
-	 "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" -> "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_2" ;
-"C#C#{5740611327153041165}.7f44dbfcbf1af9b0d8bcababbf48127e_1" [label="1: Start C::C\nFormals:  this:C*\nLocals:  \n  " color=yellow style=filled]
+	 "~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_3" -> "~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_2" ;
+"C#C#{5244587546945854124}.35ff4f7dadbc80d1150bdfd35013b5c9_1" [label="1: Start C::C\nFormals:  this:C*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "C#C#{5740611327153041165}.7f44dbfcbf1af9b0d8bcababbf48127e_1" -> "C#C#{5740611327153041165}.7f44dbfcbf1af9b0d8bcababbf48127e_2" ;
-"C#C#{5740611327153041165}.7f44dbfcbf1af9b0d8bcababbf48127e_2" [label="2: Exit C::C \n  " color=yellow style=filled]
+	 "C#C#{5244587546945854124}.35ff4f7dadbc80d1150bdfd35013b5c9_1" -> "C#C#{5244587546945854124}.35ff4f7dadbc80d1150bdfd35013b5c9_2" ;
+"C#C#{5244587546945854124}.35ff4f7dadbc80d1150bdfd35013b5c9_2" [label="2: Exit C::C \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~C#C#(8663121109475859597).b2a38f2bbddcdfc0b09e6d7290006778_1" [label="1: Start C::__infer_inner_destructor_~C\nFormals:  this:C*\nLocals:  \n  " color=yellow style=filled]
+"__infer_inner_destructor_~C#C#(7422570726995459483).436af5c75e9d451be904998140bed162_1" [label="1: Start C::__infer_inner_destructor_~C\nFormals:  this:C*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~C#C#(8663121109475859597).b2a38f2bbddcdfc0b09e6d7290006778_1" -> "__infer_inner_destructor_~C#C#(8663121109475859597).b2a38f2bbddcdfc0b09e6d7290006778_2" ;
-"__infer_inner_destructor_~C#C#(8663121109475859597).b2a38f2bbddcdfc0b09e6d7290006778_2" [label="2: Exit C::__infer_inner_destructor_~C \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~C#C#(7422570726995459483).436af5c75e9d451be904998140bed162_1" -> "__infer_inner_destructor_~C#C#(7422570726995459483).436af5c75e9d451be904998140bed162_2" ;
+"__infer_inner_destructor_~C#C#(7422570726995459483).436af5c75e9d451be904998140bed162_2" [label="2: Exit C::__infer_inner_destructor_~C \n  " color=yellow style=filled]
 	
 
-"~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_1" [label="1: Start C::~C\nFormals:  this:C*\nLocals:  \n  " color=yellow style=filled]
+"~C#C#(7422570726995459483).abd241927cbcfbab712c1d488aa2b4eb_1" [label="1: Start C::~C\nFormals:  this:C*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_1" -> "~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_3" ;
-"~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_2" [label="2: Exit C::~C \n  " color=yellow style=filled]
+	 "~C#C#(7422570726995459483).abd241927cbcfbab712c1d488aa2b4eb_1" -> "~C#C#(7422570726995459483).abd241927cbcfbab712c1d488aa2b4eb_3" ;
+"~C#C#(7422570726995459483).abd241927cbcfbab712c1d488aa2b4eb_2" [label="2: Exit C::~C \n  " color=yellow style=filled]
 	
 
-"~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:C* [line 25, column 8]\n  _=*n$0:C [line 25, column 8]\n  n$2=_fun_C::__infer_inner_destructor_~C(n$0:C*) injected [line 25, column 8]\n " shape="box"]
+"~C#C#(7422570726995459483).abd241927cbcfbab712c1d488aa2b4eb_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:C* [line 25, column 8]\n  _=*n$0:C [line 25, column 8]\n  n$2=_fun_C::__infer_inner_destructor_~C(n$0:C*) injected [line 25, column 8]\n " shape="box"]
 	
 
-	 "~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_3" -> "~C#C#(8663121109475859597).c4887e86b7c3519c4397dd483476d5d2_2" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_1" [label="1: Start D::D\nFormals:  this:D*\nLocals:  \n  " color=yellow style=filled]
+	 "~C#C#(7422570726995459483).abd241927cbcfbab712c1d488aa2b4eb_3" -> "~C#C#(7422570726995459483).abd241927cbcfbab712c1d488aa2b4eb_2" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_1" [label="1: Start D::D\nFormals:  this:D*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_1" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_9" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_2" [label="2: Exit D::D \n  " color=yellow style=filled]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_1" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_9" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_2" [label="2: Exit D::D \n  " color=yellow style=filled]
 	
 
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" [label="3:  Constructor Init \n   n$1=*&this:D* [line 30, column 3]\n " shape="box"]
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_3" [label="3:  Constructor Init \n   n$1=*&this:D* [line 30, column 3]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" [label="4:  Constructor Init \n   n$2=_fun_B::B(n$1.b:B*) [line 30, column 3]\n " shape="box"]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_3" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_4" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_4" [label="4:  Constructor Init \n   n$2=_fun_B::B(n$1.b:B*) [line 30, column 3]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_4" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_2" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" [label="5:  Constructor Init \n   n$3=*&this:D* [line 30, column 3]\n " shape="box"]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_4" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_2" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_5" [label="5:  Constructor Init \n   n$3=*&this:D* [line 30, column 3]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" [label="6:  Constructor Init \n   n$4=_fun_C::C(n$3:D*) [line 30, column 3]\n " shape="box"]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_5" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_6" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_6" [label="6:  Constructor Init \n   n$4=_fun_C::C(n$3:D*) [line 30, column 3]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_6" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_3" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_7" [label="7:  Constructor Init \n   n$5=*&this:D* [line 30, column 3]\n " shape="box"]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_6" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_3" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_7" [label="7:  Constructor Init \n   n$5=*&this:D* [line 30, column 3]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_7" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_8" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_8" [label="8:  Constructor Init \n   n$6=_fun_A::A(n$5:D*) [line 30, column 3]\n " shape="box"]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_7" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_8" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_8" [label="8:  Constructor Init \n   n$6=_fun_A::A(n$5:D*) [line 30, column 3]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_8" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_5" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_9" [label="9:  Constructor Init \n   n$7=*&this:D* [line 30, column 7]\n " shape="box"]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_8" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_5" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_9" [label="9:  Constructor Init \n   n$7=*&this:D* [line 30, column 7]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_9" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_10" ;
-"D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_10" [label="10:  Constructor Init \n   n$8=_fun_T::T(n$7:D*) [line 30, column 3]\n " shape="box"]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_9" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_10" ;
+"D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_10" [label="10:  Constructor Init \n   n$8=_fun_T::T(n$7:D*) [line 30, column 3]\n " shape="box"]
 	
 
-	 "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_10" -> "D#D#{14859184625718510620}.5a45d8adce2fa330a108d14c6d9e7ad2_7" ;
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_1" [label="1: Start D::__infer_inner_destructor_~D\nFormals:  this:D*\nLocals:  a:A \n  " color=yellow style=filled]
+	 "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_10" -> "D#D#{15354926930948875645}.d9099b8b7573ccbc6b1799f66ac91cbf_7" ;
+"__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_1" [label="1: Start D::__infer_inner_destructor_~D\nFormals:  this:D*\nLocals:  a:A \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_1" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" ;
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_2" [label="2: Exit D::__infer_inner_destructor_~D \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_1" -> "__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_5" ;
+"__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_2" [label="2: Exit D::__infer_inner_destructor_~D \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_3" [label="3:  Destruction(fields) \n   n$0=*&this:D* [line 31, column 15]\n  _=*n$0.b:B [line 31, column 15]\n  n$2=_fun_B::~B(n$0.b:B*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$6=_fun_C::__infer_inner_destructor_~C(n$0:D*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:D*) injected [line 31, column 15]\n " shape="box"]
+"__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_3" [label="3:  Destruction(fields) \n   n$0=*&this:D* [line 31, column 15]\n  _=*n$0.b:B [line 31, column 15]\n  n$2=_fun_B::~B(n$0.b:B*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$6=_fun_C::__infer_inner_destructor_~C(n$0:D*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:D*) injected [line 31, column 15]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_3" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_2" ;
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" [label="4:  Destruction(Scope) \n   _=*&a:A [line 31, column 15]\n  n$9=_fun_A::~A(&a:A*) injected [line 31, column 15]\n " shape="box"]
+	 "__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_3" -> "__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_2" ;
+"__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_4" [label="4:  Destruction(Scope) \n   _=*&a:A [line 31, column 15]\n  n$9=_fun_A::~A(&a:A*) injected [line 31, column 15]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_3" ;
-"__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(a:A); [line 31, column 10]\n  n$11=_fun_A::A(&a:A*) [line 31, column 12]\n " shape="box"]
+	 "__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_4" -> "__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_3" ;
+"__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(a:A); [line 31, column 10]\n  n$11=_fun_A::A(&a:A*) [line 31, column 12]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_5" -> "__infer_inner_destructor_~D#D#(5618221758133596168).bafb8a40b92952d90ec3736fc827de7f_4" ;
-"~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_1" [label="1: Start D::~D\nFormals:  this:D*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_5" -> "__infer_inner_destructor_~D#D#(6866635847777447554).16de56fdd2396d9f12bb3b8a30f083d0_4" ;
+"~D#D#(6866635847777447554).8f21d230aff741aaef83dfdcff453160_1" [label="1: Start D::~D\nFormals:  this:D*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_1" -> "~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_3" ;
-"~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_2" [label="2: Exit D::~D \n  " color=yellow style=filled]
+	 "~D#D#(6866635847777447554).8f21d230aff741aaef83dfdcff453160_1" -> "~D#D#(6866635847777447554).8f21d230aff741aaef83dfdcff453160_3" ;
+"~D#D#(6866635847777447554).8f21d230aff741aaef83dfdcff453160_2" [label="2: Exit D::~D \n  " color=yellow style=filled]
 	
 
-"~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:D* [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$4=_fun_D::__infer_inner_destructor_~D(n$0:D*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:D*) injected [line 31, column 15]\n " shape="box"]
+"~D#D#(6866635847777447554).8f21d230aff741aaef83dfdcff453160_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:D* [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$4=_fun_D::__infer_inner_destructor_~D(n$0:D*) injected [line 31, column 15]\n  _=*n$0:D [line 31, column 15]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:D*) injected [line 31, column 15]\n " shape="box"]
 	
 
-	 "~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_3" -> "~D#D#(5618221758133596168).bd1f40c4fa1d5ed90c732a34d33e4d7c_2" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_1" [label="1: Start E::E\nFormals:  this:E*\nLocals:  \n  " color=yellow style=filled]
+	 "~D#D#(6866635847777447554).8f21d230aff741aaef83dfdcff453160_3" -> "~D#D#(6866635847777447554).8f21d230aff741aaef83dfdcff453160_2" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_1" [label="1: Start E::E\nFormals:  this:E*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_1" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_11" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_2" [label="2: Exit E::E \n  " color=yellow style=filled]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_1" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_11" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_2" [label="2: Exit E::E \n  " color=yellow style=filled]
 	
 
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" [label="3:  Constructor Init \n   n$1=*&this:E* [line 35, column 3]\n " shape="box"]
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_3" [label="3:  Constructor Init \n   n$1=*&this:E* [line 35, column 3]\n " shape="box"]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" [label="4:  Constructor Init \n   n$2=_fun_D::D(n$1:E*) [line 35, column 3]\n " shape="box"]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_3" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_4" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_4" [label="4:  Constructor Init \n   n$2=_fun_D::D(n$1:E*) [line 35, column 3]\n " shape="box"]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_4" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_2" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" [label="5:  Constructor Init \n   n$3=*&this:E* [line 35, column 3]\n " shape="box"]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_4" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_2" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_5" [label="5:  Constructor Init \n   n$3=*&this:E* [line 35, column 3]\n " shape="box"]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" [label="6:  Constructor Init \n   n$4=_fun_C::C(n$3:E*) [line 35, column 3]\n " shape="box"]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_5" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_6" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_6" [label="6:  Constructor Init \n   n$4=_fun_C::C(n$3:E*) [line 35, column 3]\n " shape="box"]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_6" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_3" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" [label="7:  Constructor Init \n   n$5=*&this:E* [line 35, column 3]\n " shape="box"]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_6" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_3" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_7" [label="7:  Constructor Init \n   n$5=*&this:E* [line 35, column 3]\n " shape="box"]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_8" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_8" [label="8:  Constructor Init \n   n$6=_fun_B::B(n$5:E*) [line 35, column 3]\n " shape="box"]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_7" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_8" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_8" [label="8:  Constructor Init \n   n$6=_fun_B::B(n$5:E*) [line 35, column 3]\n " shape="box"]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_8" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_5" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_9" [label="9:  Constructor Init \n   n$7=*&this:E* [line 35, column 3]\n " shape="box"]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_8" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_5" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_9" [label="9:  Constructor Init \n   n$7=*&this:E* [line 35, column 3]\n " shape="box"]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_9" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_10" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_10" [label="10:  Constructor Init \n   n$8=_fun_A::A(n$7:E*) [line 35, column 3]\n " shape="box"]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_9" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_10" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_10" [label="10:  Constructor Init \n   n$8=_fun_A::A(n$7:E*) [line 35, column 3]\n " shape="box"]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_10" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_7" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_11" [label="11:  Constructor Init \n   n$9=*&this:E* [line 35, column 7]\n " shape="box"]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_10" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_7" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_11" [label="11:  Constructor Init \n   n$9=*&this:E* [line 35, column 7]\n " shape="box"]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_11" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_12" ;
-"E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_12" [label="12:  Constructor Init \n   n$10=_fun_T::T(n$9:E*) [line 35, column 3]\n " shape="box"]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_11" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_12" ;
+"E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_12" [label="12:  Constructor Init \n   n$10=_fun_T::T(n$9:E*) [line 35, column 3]\n " shape="box"]
 	
 
-	 "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_12" -> "E#E#{7886195349376518403}.02845ceb3bc1b2ade1c6ab65150dfc34_9" ;
-"__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_1" [label="1: Start E::__infer_inner_destructor_~E\nFormals:  this:E*\nLocals:  \n  " color=yellow style=filled]
+	 "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_12" -> "E#E#{9756747202958380830}.7c9a7789a6b3c0dc053ab94255cd8570_9" ;
+"__infer_inner_destructor_~E#E#(4366070428831679553).b00342f9742d6431fd48c4f0c3e31119_1" [label="1: Start E::__infer_inner_destructor_~E\nFormals:  this:E*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_1" -> "__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_3" ;
-"__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_2" [label="2: Exit E::__infer_inner_destructor_~E \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~E#E#(4366070428831679553).b00342f9742d6431fd48c4f0c3e31119_1" -> "__infer_inner_destructor_~E#E#(4366070428831679553).b00342f9742d6431fd48c4f0c3e31119_3" ;
+"__infer_inner_destructor_~E#E#(4366070428831679553).b00342f9742d6431fd48c4f0c3e31119_2" [label="2: Exit E::__infer_inner_destructor_~E \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_3" [label="3:  Destruction(fields) \n   n$0=*&this:E* [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$6=_fun_D::__infer_inner_destructor_~D(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$4=_fun_C::__infer_inner_destructor_~C(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:E*) injected [line 36, column 8]\n " shape="box"]
+"__infer_inner_destructor_~E#E#(4366070428831679553).b00342f9742d6431fd48c4f0c3e31119_3" [label="3:  Destruction(fields) \n   n$0=*&this:E* [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$6=_fun_D::__infer_inner_destructor_~D(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$4=_fun_C::__infer_inner_destructor_~C(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:E*) injected [line 36, column 8]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_3" -> "__infer_inner_destructor_~E#E#(2987579715549688623).0c2beae2fa1834341749df3ec1f5ac22_2" ;
-"~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_1" [label="1: Start E::~E\nFormals:  this:E*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~E#E#(4366070428831679553).b00342f9742d6431fd48c4f0c3e31119_3" -> "__infer_inner_destructor_~E#E#(4366070428831679553).b00342f9742d6431fd48c4f0c3e31119_2" ;
+"~E#E#(4366070428831679553).8510eb940e49edf8e73a0237ce7f76f4_1" [label="1: Start E::~E\nFormals:  this:E*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_1" -> "~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_3" ;
-"~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_2" [label="2: Exit E::~E \n  " color=yellow style=filled]
+	 "~E#E#(4366070428831679553).8510eb940e49edf8e73a0237ce7f76f4_1" -> "~E#E#(4366070428831679553).8510eb940e49edf8e73a0237ce7f76f4_3" ;
+"~E#E#(4366070428831679553).8510eb940e49edf8e73a0237ce7f76f4_2" [label="2: Exit E::~E \n  " color=yellow style=filled]
 	
 
-"~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:E* [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$6=_fun_E::__infer_inner_destructor_~E(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:E*) injected [line 36, column 8]\n " shape="box"]
+"~E#E#(4366070428831679553).8510eb940e49edf8e73a0237ce7f76f4_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:E* [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$6=_fun_E::__infer_inner_destructor_~E(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:E*) injected [line 36, column 8]\n  _=*n$0:E [line 36, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:E*) injected [line 36, column 8]\n " shape="box"]
 	
 
-	 "~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_3" -> "~E#E#(2987579715549688623).452c4ab608cbb84e7144bf65a39276d9_2" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_1" [label="1: Start F::F\nFormals:  this:F*\nLocals:  \n  " color=yellow style=filled]
+	 "~E#E#(4366070428831679553).8510eb940e49edf8e73a0237ce7f76f4_3" -> "~E#E#(4366070428831679553).8510eb940e49edf8e73a0237ce7f76f4_2" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_1" [label="1: Start F::F\nFormals:  this:F*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_1" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_11" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_2" [label="2: Exit F::F \n  " color=yellow style=filled]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_1" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_11" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_2" [label="2: Exit F::F \n  " color=yellow style=filled]
 	
 
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" [label="3:  Constructor Init \n   n$1=*&this:F* [line 40, column 3]\n " shape="box"]
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_3" [label="3:  Constructor Init \n   n$1=*&this:F* [line 40, column 3]\n " shape="box"]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" [label="4:  Constructor Init \n   n$2=_fun_D::D(n$1:F*) [line 40, column 3]\n " shape="box"]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_3" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_4" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_4" [label="4:  Constructor Init \n   n$2=_fun_D::D(n$1:F*) [line 40, column 3]\n " shape="box"]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_4" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_2" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" [label="5:  Constructor Init \n   n$3=*&this:F* [line 40, column 3]\n " shape="box"]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_4" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_2" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_5" [label="5:  Constructor Init \n   n$3=*&this:F* [line 40, column 3]\n " shape="box"]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" [label="6:  Constructor Init \n   n$4=_fun_B::B(n$3:F*) [line 40, column 3]\n " shape="box"]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_5" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_6" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_6" [label="6:  Constructor Init \n   n$4=_fun_B::B(n$3:F*) [line 40, column 3]\n " shape="box"]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_6" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_3" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" [label="7:  Constructor Init \n   n$5=*&this:F* [line 40, column 3]\n " shape="box"]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_6" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_3" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_7" [label="7:  Constructor Init \n   n$5=*&this:F* [line 40, column 3]\n " shape="box"]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_8" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_8" [label="8:  Constructor Init \n   n$6=_fun_C::C(n$5:F*) [line 40, column 3]\n " shape="box"]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_7" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_8" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_8" [label="8:  Constructor Init \n   n$6=_fun_C::C(n$5:F*) [line 40, column 3]\n " shape="box"]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_8" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_5" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_9" [label="9:  Constructor Init \n   n$7=*&this:F* [line 40, column 3]\n " shape="box"]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_8" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_5" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_9" [label="9:  Constructor Init \n   n$7=*&this:F* [line 40, column 3]\n " shape="box"]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_9" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_10" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_10" [label="10:  Constructor Init \n   n$8=_fun_A::A(n$7:F*) [line 40, column 3]\n " shape="box"]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_9" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_10" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_10" [label="10:  Constructor Init \n   n$8=_fun_A::A(n$7:F*) [line 40, column 3]\n " shape="box"]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_10" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_7" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_11" [label="11:  Constructor Init \n   n$9=*&this:F* [line 40, column 7]\n " shape="box"]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_10" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_7" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_11" [label="11:  Constructor Init \n   n$9=*&this:F* [line 40, column 7]\n " shape="box"]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_11" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_12" ;
-"F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_12" [label="12:  Constructor Init \n   n$10=_fun_T::T(n$9:F*) [line 40, column 3]\n " shape="box"]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_11" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_12" ;
+"F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_12" [label="12:  Constructor Init \n   n$10=_fun_T::T(n$9:F*) [line 40, column 3]\n " shape="box"]
 	
 
-	 "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_12" -> "F#F#{11715195598984476266}.884ea102935d653fcf591dff17f31401_9" ;
-"__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_1" [label="1: Start F::__infer_inner_destructor_~F\nFormals:  this:F*\nLocals:  \n  " color=yellow style=filled]
+	 "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_12" -> "F#F#{9967085360295969999}.d1320a3cb11a3b8ae00bfc79f3ea3053_9" ;
+"__infer_inner_destructor_~F#F#(4479115064935782264).d644b944bc6d5decc0673cb3453974d2_1" [label="1: Start F::__infer_inner_destructor_~F\nFormals:  this:F*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_1" -> "__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_3" ;
-"__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_2" [label="2: Exit F::__infer_inner_destructor_~F \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~F#F#(4479115064935782264).d644b944bc6d5decc0673cb3453974d2_1" -> "__infer_inner_destructor_~F#F#(4479115064935782264).d644b944bc6d5decc0673cb3453974d2_3" ;
+"__infer_inner_destructor_~F#F#(4479115064935782264).d644b944bc6d5decc0673cb3453974d2_2" [label="2: Exit F::__infer_inner_destructor_~F \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_3" [label="3:  Destruction(fields) \n   n$0=*&this:F* [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$4=_fun_D::__infer_inner_destructor_~D(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:F*) injected [line 41, column 8]\n " shape="box"]
+"__infer_inner_destructor_~F#F#(4479115064935782264).d644b944bc6d5decc0673cb3453974d2_3" [label="3:  Destruction(fields) \n   n$0=*&this:F* [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$4=_fun_D::__infer_inner_destructor_~D(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:F*) injected [line 41, column 8]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_3" -> "__infer_inner_destructor_~F#F#(5727529154579633650).20752c7323d15bc6d30fac190df5baf8_2" ;
-"~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_1" [label="1: Start F::~F\nFormals:  this:F*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~F#F#(4479115064935782264).d644b944bc6d5decc0673cb3453974d2_3" -> "__infer_inner_destructor_~F#F#(4479115064935782264).d644b944bc6d5decc0673cb3453974d2_2" ;
+"~F#F#(4479115064935782264).a7c9703000cea68e76179e1b0ad2cc6f_1" [label="1: Start F::~F\nFormals:  this:F*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_1" -> "~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_3" ;
-"~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_2" [label="2: Exit F::~F \n  " color=yellow style=filled]
+	 "~F#F#(4479115064935782264).a7c9703000cea68e76179e1b0ad2cc6f_1" -> "~F#F#(4479115064935782264).a7c9703000cea68e76179e1b0ad2cc6f_3" ;
+"~F#F#(4479115064935782264).a7c9703000cea68e76179e1b0ad2cc6f_2" [label="2: Exit F::~F \n  " color=yellow style=filled]
 	
 
-"~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:F* [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$8=_fun_F::__infer_inner_destructor_~F(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$6=_fun_C::__infer_inner_destructor_~C(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:F*) injected [line 41, column 8]\n " shape="box"]
+"~F#F#(4479115064935782264).a7c9703000cea68e76179e1b0ad2cc6f_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:F* [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$8=_fun_F::__infer_inner_destructor_~F(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$6=_fun_C::__infer_inner_destructor_~C(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$4=_fun_A::__infer_inner_destructor_~A(n$0:F*) injected [line 41, column 8]\n  _=*n$0:F [line 41, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:F*) injected [line 41, column 8]\n " shape="box"]
 	
 
-	 "~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_3" -> "~F#F#(5727529154579633650).f1ad6d785ba06c47f402bc76b9b85f73_2" ;
-"T#T#{15422546710357390924}.2e459864a844310ea5ab719ea4768a72_1" [label="1: Start T::T\nFormals:  this:T*\nLocals:  \n  " color=yellow style=filled]
+	 "~F#F#(4479115064935782264).a7c9703000cea68e76179e1b0ad2cc6f_3" -> "~F#F#(4479115064935782264).a7c9703000cea68e76179e1b0ad2cc6f_2" ;
+"T#T#{16041012105457934125}.31efd09500985bfb5eff574f77f6a321_1" [label="1: Start T::T\nFormals:  this:T*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "T#T#{15422546710357390924}.2e459864a844310ea5ab719ea4768a72_1" -> "T#T#{15422546710357390924}.2e459864a844310ea5ab719ea4768a72_2" ;
-"T#T#{15422546710357390924}.2e459864a844310ea5ab719ea4768a72_2" [label="2: Exit T::T \n  " color=yellow style=filled]
+	 "T#T#{16041012105457934125}.31efd09500985bfb5eff574f77f6a321_1" -> "T#T#{16041012105457934125}.31efd09500985bfb5eff574f77f6a321_2" ;
+"T#T#{16041012105457934125}.31efd09500985bfb5eff574f77f6a321_2" [label="2: Exit T::T \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~T#T#(198129514833990712).6f8f8037f60d385be9f35cbd1252e677_1" [label="1: Start T::__infer_inner_destructor_~T\nFormals:  this:T*\nLocals:  \n  " color=yellow style=filled]
+"__infer_inner_destructor_~T#T#(1446262129501020082).23ce4dfbe7a360d7f5ab01e20884044f_1" [label="1: Start T::__infer_inner_destructor_~T\nFormals:  this:T*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~T#T#(198129514833990712).6f8f8037f60d385be9f35cbd1252e677_1" -> "__infer_inner_destructor_~T#T#(198129514833990712).6f8f8037f60d385be9f35cbd1252e677_2" ;
-"__infer_inner_destructor_~T#T#(198129514833990712).6f8f8037f60d385be9f35cbd1252e677_2" [label="2: Exit T::__infer_inner_destructor_~T \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~T#T#(1446262129501020082).23ce4dfbe7a360d7f5ab01e20884044f_1" -> "__infer_inner_destructor_~T#T#(1446262129501020082).23ce4dfbe7a360d7f5ab01e20884044f_2" ;
+"__infer_inner_destructor_~T#T#(1446262129501020082).23ce4dfbe7a360d7f5ab01e20884044f_2" [label="2: Exit T::__infer_inner_destructor_~T \n  " color=yellow style=filled]
 	
 
-"~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_1" [label="1: Start T::~T\nFormals:  this:T*\nLocals:  \n  " color=yellow style=filled]
+"~T#T#(1446262129501020082).b0f7df08851299bb569491e69a2b3b22_1" [label="1: Start T::~T\nFormals:  this:T*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_1" -> "~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_3" ;
-"~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_2" [label="2: Exit T::~T \n  " color=yellow style=filled]
+	 "~T#T#(1446262129501020082).b0f7df08851299bb569491e69a2b3b22_1" -> "~T#T#(1446262129501020082).b0f7df08851299bb569491e69a2b3b22_3" ;
+"~T#T#(1446262129501020082).b0f7df08851299bb569491e69a2b3b22_2" [label="2: Exit T::~T \n  " color=yellow style=filled]
 	
 
-"~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:T* [line 10, column 8]\n  _=*n$0:T [line 10, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:T*) injected [line 10, column 8]\n " shape="box"]
+"~T#T#(1446262129501020082).b0f7df08851299bb569491e69a2b3b22_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:T* [line 10, column 8]\n  _=*n$0:T [line 10, column 8]\n  n$2=_fun_T::__infer_inner_destructor_~T(n$0:T*) injected [line 10, column 8]\n " shape="box"]
 	
 
-	 "~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_3" -> "~T#T#(198129514833990712).9a1fb2f2d427aff6059a6de0c57b5949_2" ;
+	 "~T#T#(1446262129501020082).b0f7df08851299bb569491e69a2b3b22_3" -> "~T#T#(1446262129501020082).b0f7df08851299bb569491e69a2b3b22_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/scope.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/scope.cpp.dot
index fe76d3c18..c88d86baa 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/scope.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/scope.cpp.dot
@@ -186,163 +186,163 @@ digraph cfg {
 
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_5" ;
 	 "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_11" -> "test2#destructor_scope#2993434300384255445.24bf3f4c27c1719ee94d608a0df996b1_6" ;
-"S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_1" [label="1: Start destructor_scope::S::S\nFormals:  this:destructor_scope::S*\nLocals:  \n  " color=yellow style=filled]
+"S#S#destructor_scope#{10339448990053469571|constexpr}.9d786aebef75b5f7db70cd3394e0833b_1" [label="1: Start destructor_scope::S::S\nFormals:  this:destructor_scope::S*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_1" -> "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" ;
-"S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_2" [label="2: Exit destructor_scope::S::S \n  " color=yellow style=filled]
+	 "S#S#destructor_scope#{10339448990053469571|constexpr}.9d786aebef75b5f7db70cd3394e0833b_1" -> "S#S#destructor_scope#{10339448990053469571|constexpr}.9d786aebef75b5f7db70cd3394e0833b_3" ;
+"S#S#destructor_scope#{10339448990053469571|constexpr}.9d786aebef75b5f7db70cd3394e0833b_2" [label="2: Exit destructor_scope::S::S \n  " color=yellow style=filled]
 	
 
-"S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" [label="3:  Constructor Init \n   n$1=*&this:destructor_scope::S* [line 19, column 8]\n " shape="box"]
+"S#S#destructor_scope#{10339448990053469571|constexpr}.9d786aebef75b5f7db70cd3394e0833b_3" [label="3:  Constructor Init \n   n$1=*&this:destructor_scope::S* [line 19, column 8]\n " shape="box"]
 	
 
-	 "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_3" -> "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_4" ;
-"S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_4" [label="4:  Constructor Init \n   n$2=_fun_destructor_scope::X::X(n$1.x1:destructor_scope::X*) [line 19, column 8]\n " shape="box"]
+	 "S#S#destructor_scope#{10339448990053469571|constexpr}.9d786aebef75b5f7db70cd3394e0833b_3" -> "S#S#destructor_scope#{10339448990053469571|constexpr}.9d786aebef75b5f7db70cd3394e0833b_4" ;
+"S#S#destructor_scope#{10339448990053469571|constexpr}.9d786aebef75b5f7db70cd3394e0833b_4" [label="4:  Constructor Init \n   n$2=_fun_destructor_scope::X::X(n$1.x1:destructor_scope::X*) [line 19, column 8]\n " shape="box"]
 	
 
-	 "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_4" -> "S#S#destructor_scope#{12210000843635331998|constexpr}.cb28b79e3a75cf83720c23a83cf5bf01_2" ;
-"__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_1" [label="1: Start destructor_scope::S::__infer_inner_destructor_~S\nFormals:  this:destructor_scope::S*\nLocals:  \n  " color=yellow style=filled]
+	 "S#S#destructor_scope#{10339448990053469571|constexpr}.9d786aebef75b5f7db70cd3394e0833b_4" -> "S#S#destructor_scope#{10339448990053469571|constexpr}.9d786aebef75b5f7db70cd3394e0833b_2" ;
+"__infer_inner_destructor_~S#S#destructor_scope#(7916617764589254644).2bd5f94552ab3de5b18103298afc24eb_1" [label="1: Start destructor_scope::S::__infer_inner_destructor_~S\nFormals:  this:destructor_scope::S*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_1" -> "__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_3" ;
-"__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_2" [label="2: Exit destructor_scope::S::__infer_inner_destructor_~S \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~S#S#destructor_scope#(7916617764589254644).2bd5f94552ab3de5b18103298afc24eb_1" -> "__infer_inner_destructor_~S#S#destructor_scope#(7916617764589254644).2bd5f94552ab3de5b18103298afc24eb_3" ;
+"__infer_inner_destructor_~S#S#destructor_scope#(7916617764589254644).2bd5f94552ab3de5b18103298afc24eb_2" [label="2: Exit destructor_scope::S::__infer_inner_destructor_~S \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_3" [label="3:  Destruction(fields) \n   n$0=*&this:destructor_scope::S* [line 19, column 8]\n  _=*n$0.x1:destructor_scope::X [line 19, column 8]\n  n$2=_fun_destructor_scope::X::~X(n$0.x1:destructor_scope::X*) injected [line 19, column 8]\n " shape="box"]
+"__infer_inner_destructor_~S#S#destructor_scope#(7916617764589254644).2bd5f94552ab3de5b18103298afc24eb_3" [label="3:  Destruction(fields) \n   n$0=*&this:destructor_scope::S* [line 19, column 8]\n  _=*n$0.x1:destructor_scope::X [line 19, column 8]\n  n$2=_fun_destructor_scope::X::~X(n$0.x1:destructor_scope::X*) injected [line 19, column 8]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_3" -> "__infer_inner_destructor_~S#S#destructor_scope#(9287491061312513566).4ef80b764b293fdc4260c9ce06a110d3_2" ;
-"~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_1" [label="1: Start destructor_scope::S::~S\nFormals:  this:destructor_scope::S*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~S#S#destructor_scope#(7916617764589254644).2bd5f94552ab3de5b18103298afc24eb_3" -> "__infer_inner_destructor_~S#S#destructor_scope#(7916617764589254644).2bd5f94552ab3de5b18103298afc24eb_2" ;
+"~S#S#destructor_scope#(7916617764589254644).365a6a74644dcae95b607f724b1c01a5_1" [label="1: Start destructor_scope::S::~S\nFormals:  this:destructor_scope::S*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_1" -> "~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_3" ;
-"~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_2" [label="2: Exit destructor_scope::S::~S \n  " color=yellow style=filled]
+	 "~S#S#destructor_scope#(7916617764589254644).365a6a74644dcae95b607f724b1c01a5_1" -> "~S#S#destructor_scope#(7916617764589254644).365a6a74644dcae95b607f724b1c01a5_3" ;
+"~S#S#destructor_scope#(7916617764589254644).365a6a74644dcae95b607f724b1c01a5_2" [label="2: Exit destructor_scope::S::~S \n  " color=yellow style=filled]
 	
 
-"~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::S* [line 19, column 8]\n  _=*n$0:destructor_scope::S [line 19, column 8]\n  n$2=_fun_destructor_scope::S::__infer_inner_destructor_~S(n$0:destructor_scope::S*) injected [line 19, column 8]\n " shape="box"]
+"~S#S#destructor_scope#(7916617764589254644).365a6a74644dcae95b607f724b1c01a5_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::S* [line 19, column 8]\n  _=*n$0:destructor_scope::S [line 19, column 8]\n  n$2=_fun_destructor_scope::S::__infer_inner_destructor_~S(n$0:destructor_scope::S*) injected [line 19, column 8]\n " shape="box"]
 	
 
-	 "~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_3" -> "~S#S#destructor_scope#(9287491061312513566).aca6b266020a04cd52a80258435bda76_2" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_1" [label="1: Start destructor_scope::W::__infer_inner_destructor_~W\nFormals:  this:destructor_scope::W*\nLocals:  y:destructor_scope::Y x:destructor_scope::X \n  " color=yellow style=filled]
+	 "~S#S#destructor_scope#(7916617764589254644).365a6a74644dcae95b607f724b1c01a5_3" -> "~S#S#destructor_scope#(7916617764589254644).365a6a74644dcae95b607f724b1c01a5_2" ;
+"__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_1" [label="1: Start destructor_scope::W::__infer_inner_destructor_~W\nFormals:  this:destructor_scope::W*\nLocals:  y:destructor_scope::Y x:destructor_scope::X \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_1" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_2" [label="2: Exit destructor_scope::W::__infer_inner_destructor_~W \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_1" -> "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_10" ;
+"__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_2" [label="2: Exit destructor_scope::W::__infer_inner_destructor_~W \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_3" [label="3:  Destruction(fields) \n   n$0=*&this:destructor_scope::W* [line 34, column 3]\n  _=*n$0.s:destructor_scope::S [line 34, column 3]\n  n$6=_fun_destructor_scope::S::~S(n$0.s:destructor_scope::S*) injected [line 34, column 3]\n  _=*n$0.y:destructor_scope::Y [line 34, column 3]\n  n$4=_fun_destructor_scope::Y::~Y(n$0.y:destructor_scope::Y*) injected [line 34, column 3]\n  _=*n$0.x:destructor_scope::X [line 34, column 3]\n  n$2=_fun_destructor_scope::X::~X(n$0.x:destructor_scope::X*) injected [line 34, column 3]\n " shape="box"]
+"__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_3" [label="3:  Destruction(fields) \n   n$0=*&this:destructor_scope::W* [line 34, column 3]\n  _=*n$0.s:destructor_scope::S [line 34, column 3]\n  n$6=_fun_destructor_scope::S::~S(n$0.s:destructor_scope::S*) injected [line 34, column 3]\n  _=*n$0.y:destructor_scope::Y [line 34, column 3]\n  n$4=_fun_destructor_scope::Y::~Y(n$0.y:destructor_scope::Y*) injected [line 34, column 3]\n  _=*n$0.x:destructor_scope::X [line 34, column 3]\n  n$2=_fun_destructor_scope::X::~X(n$0.x:destructor_scope::X*) injected [line 34, column 3]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_3" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_2" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" [label="4:  Destruction(Scope) \n   _=*&y:destructor_scope::Y [line 34, column 3]\n  n$9=_fun_destructor_scope::Y::~Y(&y:destructor_scope::Y*) injected [line 34, column 3]\n  _=*&x:destructor_scope::X [line 34, column 3]\n  n$11=_fun_destructor_scope::X::~X(&x:destructor_scope::X*) injected [line 34, column 3]\n " shape="box"]
+	 "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_3" -> "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_2" ;
+"__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_4" [label="4:  Destruction(Scope) \n   _=*&y:destructor_scope::Y [line 34, column 3]\n  n$9=_fun_destructor_scope::Y::~Y(&y:destructor_scope::Y*) injected [line 34, column 3]\n  _=*&x:destructor_scope::X [line 34, column 3]\n  n$11=_fun_destructor_scope::X::~X(&x:destructor_scope::X*) injected [line 34, column 3]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_3" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(y:destructor_scope::Y); [line 33, column 5]\n  n$13=_fun_destructor_scope::Y::Y(&y:destructor_scope::Y*) [line 33, column 7]\n " shape="box"]
+	 "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_4" -> "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_3" ;
+"__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(y:destructor_scope::Y); [line 33, column 5]\n  n$13=_fun_destructor_scope::Y::Y(&y:destructor_scope::Y*) [line 33, column 7]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_4" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_6" [label="6: + \n  " ]
+	 "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_5" -> "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_4" ;
+"__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_6" [label="6: + \n  " ]
 	
 
-	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_6" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_5" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" [label="7: Prune (true branch, if) \n   n$14=*&this:destructor_scope::W* [line 31, column 9]\n  n$15=*n$14.b:_Bool [line 31, column 9]\n  PRUNE(n$15, true); [line 31, column 9]\n " shape="invhouse"]
+	 "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_6" -> "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_5" ;
+"__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_7" [label="7: Prune (true branch, if) \n   n$14=*&this:destructor_scope::W* [line 31, column 9]\n  n$15=*n$14.b:_Bool [line 31, column 9]\n  PRUNE(n$15, true); [line 31, column 9]\n " shape="invhouse"]
 	
 
-	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_8" [label="8: Prune (false branch, if) \n   n$14=*&this:destructor_scope::W* [line 31, column 9]\n  n$15=*n$14.b:_Bool [line 31, column 9]\n  PRUNE(!n$15, false); [line 31, column 9]\n " shape="invhouse"]
+	 "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_7" -> "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_9" ;
+"__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_8" [label="8: Prune (false branch, if) \n   n$14=*&this:destructor_scope::W* [line 31, column 9]\n  n$15=*n$14.b:_Bool [line 31, column 9]\n  PRUNE(!n$15, false); [line 31, column 9]\n " shape="invhouse"]
 	
 
-	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_8" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_6" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" [label="9:  Return Stmt \n   _=*&x:destructor_scope::X [line 32, column 7]\n  n$17=_fun_destructor_scope::X::~X(&x:destructor_scope::X*) injected [line 32, column 7]\n  n$19=*&this:destructor_scope::W* [line 32, column 7]\n  _=*n$19.s:destructor_scope::S [line 32, column 7]\n  n$25=_fun_destructor_scope::S::~S(n$19.s:destructor_scope::S*) injected [line 32, column 7]\n  _=*n$19.y:destructor_scope::Y [line 32, column 7]\n  n$23=_fun_destructor_scope::Y::~Y(n$19.y:destructor_scope::Y*) injected [line 32, column 7]\n  _=*n$19.x:destructor_scope::X [line 32, column 7]\n  n$21=_fun_destructor_scope::X::~X(n$19.x:destructor_scope::X*) injected [line 32, column 7]\n " shape="box"]
+	 "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_8" -> "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_6" ;
+"__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_9" [label="9:  Return Stmt \n   _=*&x:destructor_scope::X [line 32, column 7]\n  n$17=_fun_destructor_scope::X::~X(&x:destructor_scope::X*) injected [line 32, column 7]\n  n$19=*&this:destructor_scope::W* [line 32, column 7]\n  _=*n$19.s:destructor_scope::S [line 32, column 7]\n  n$25=_fun_destructor_scope::S::~S(n$19.s:destructor_scope::S*) injected [line 32, column 7]\n  _=*n$19.y:destructor_scope::Y [line 32, column 7]\n  n$23=_fun_destructor_scope::Y::~Y(n$19.y:destructor_scope::Y*) injected [line 32, column 7]\n  _=*n$19.x:destructor_scope::X [line 32, column 7]\n  n$21=_fun_destructor_scope::X::~X(n$19.x:destructor_scope::X*) injected [line 32, column 7]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_9" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_2" ;
-"__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(x:destructor_scope::X); [line 30, column 5]\n  n$30=_fun_destructor_scope::X::X(&x:destructor_scope::X*) [line 30, column 7]\n " shape="box"]
+	 "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_9" -> "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_2" ;
+"__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_10" [label="10:  DeclStmt \n   VARIABLE_DECLARED(x:destructor_scope::X); [line 30, column 5]\n  n$30=_fun_destructor_scope::X::X(&x:destructor_scope::X*) [line 30, column 7]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_7" ;
-	 "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_10" -> "__infer_inner_destructor_~W#W#destructor_scope#(7330614824551855498).609202c747c70b122a8a5785422f4f26_8" ;
-"~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_1" [label="1: Start destructor_scope::W::~W\nFormals:  this:destructor_scope::W*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_10" -> "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_7" ;
+	 "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_10" -> "__infer_inner_destructor_~W#W#destructor_scope#(5959723935642545200).551edf40f479ed65174b3698f6834184_8" ;
+"~W#W#destructor_scope#(5959723935642545200).7ccec4bf9ec91a77c2454d4a6dcbe8ed_1" [label="1: Start destructor_scope::W::~W\nFormals:  this:destructor_scope::W*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_1" -> "~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_3" ;
-"~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_2" [label="2: Exit destructor_scope::W::~W \n  " color=yellow style=filled]
+	 "~W#W#destructor_scope#(5959723935642545200).7ccec4bf9ec91a77c2454d4a6dcbe8ed_1" -> "~W#W#destructor_scope#(5959723935642545200).7ccec4bf9ec91a77c2454d4a6dcbe8ed_3" ;
+"~W#W#destructor_scope#(5959723935642545200).7ccec4bf9ec91a77c2454d4a6dcbe8ed_2" [label="2: Exit destructor_scope::W::~W \n  " color=yellow style=filled]
 	
 
-"~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::W* [line 34, column 3]\n  _=*n$0:destructor_scope::W [line 34, column 3]\n  n$2=_fun_destructor_scope::W::__infer_inner_destructor_~W(n$0:destructor_scope::W*) injected [line 34, column 3]\n " shape="box"]
+"~W#W#destructor_scope#(5959723935642545200).7ccec4bf9ec91a77c2454d4a6dcbe8ed_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::W* [line 34, column 3]\n  _=*n$0:destructor_scope::W [line 34, column 3]\n  n$2=_fun_destructor_scope::W::__infer_inner_destructor_~W(n$0:destructor_scope::W*) injected [line 34, column 3]\n " shape="box"]
 	
 
-	 "~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_3" -> "~W#W#destructor_scope#(7330614824551855498).f9ed98feeae8b94c6906cf3cd29688b3_2" ;
-"X#X#destructor_scope#{2603426817540977396|constexpr}.fb840cb7c96da056d7b59829caa7231d_1" [label="1: Start destructor_scope::X::X\nFormals:  this:destructor_scope::X* __param_0:destructor_scope::X const &\nLocals:  \n  " color=yellow style=filled]
+	 "~W#W#destructor_scope#(5959723935642545200).7ccec4bf9ec91a77c2454d4a6dcbe8ed_3" -> "~W#W#destructor_scope#(5959723935642545200).7ccec4bf9ec91a77c2454d4a6dcbe8ed_2" ;
+"X#X#destructor_scope#{10627201162342762010|constexpr}.0651980f9d7837f74b539945b842ec7e_1" [label="1: Start destructor_scope::X::X\nFormals:  this:destructor_scope::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#destructor_scope#{2603426817540977396|constexpr}.fb840cb7c96da056d7b59829caa7231d_1" -> "X#X#destructor_scope#{2603426817540977396|constexpr}.fb840cb7c96da056d7b59829caa7231d_2" ;
-"X#X#destructor_scope#{2603426817540977396|constexpr}.fb840cb7c96da056d7b59829caa7231d_2" [label="2: Exit destructor_scope::X::X \n  " color=yellow style=filled]
+	 "X#X#destructor_scope#{10627201162342762010|constexpr}.0651980f9d7837f74b539945b842ec7e_1" -> "X#X#destructor_scope#{10627201162342762010|constexpr}.0651980f9d7837f74b539945b842ec7e_2" ;
+"X#X#destructor_scope#{10627201162342762010|constexpr}.0651980f9d7837f74b539945b842ec7e_2" [label="2: Exit destructor_scope::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#destructor_scope#{8756367833784077567|constexpr}.fe7f9d502bc5b73ec7451a152e49956f_1" [label="1: Start destructor_scope::X::X\nFormals:  this:destructor_scope::X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#destructor_scope#{9224651542013693881|constexpr}.67649907f5b1d090351b288c1f6b9bf3_1" [label="1: Start destructor_scope::X::X\nFormals:  this:destructor_scope::X* __param_0:destructor_scope::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#destructor_scope#{8756367833784077567|constexpr}.fe7f9d502bc5b73ec7451a152e49956f_1" -> "X#X#destructor_scope#{8756367833784077567|constexpr}.fe7f9d502bc5b73ec7451a152e49956f_2" ;
-"X#X#destructor_scope#{8756367833784077567|constexpr}.fe7f9d502bc5b73ec7451a152e49956f_2" [label="2: Exit destructor_scope::X::X \n  " color=yellow style=filled]
+	 "X#X#destructor_scope#{9224651542013693881|constexpr}.67649907f5b1d090351b288c1f6b9bf3_1" -> "X#X#destructor_scope#{9224651542013693881|constexpr}.67649907f5b1d090351b288c1f6b9bf3_2" ;
+"X#X#destructor_scope#{9224651542013693881|constexpr}.67649907f5b1d090351b288c1f6b9bf3_2" [label="2: Exit destructor_scope::X::X \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~X#X#destructor_scope#(17752465063768331075).9ca577a457cb5911ce3106f5186a6435_1" [label="1: Start destructor_scope::X::__infer_inner_destructor_~X\nFormals:  this:destructor_scope::X*\nLocals:  \n  " color=yellow style=filled]
+"__infer_inner_destructor_~X#X#destructor_scope#(668994462409357749).70a8f95641703eb0541060f9b22c82f3_1" [label="1: Start destructor_scope::X::__infer_inner_destructor_~X\nFormals:  this:destructor_scope::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~X#X#destructor_scope#(17752465063768331075).9ca577a457cb5911ce3106f5186a6435_1" -> "__infer_inner_destructor_~X#X#destructor_scope#(17752465063768331075).9ca577a457cb5911ce3106f5186a6435_2" ;
-"__infer_inner_destructor_~X#X#destructor_scope#(17752465063768331075).9ca577a457cb5911ce3106f5186a6435_2" [label="2: Exit destructor_scope::X::__infer_inner_destructor_~X \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~X#X#destructor_scope#(668994462409357749).70a8f95641703eb0541060f9b22c82f3_1" -> "__infer_inner_destructor_~X#X#destructor_scope#(668994462409357749).70a8f95641703eb0541060f9b22c82f3_2" ;
+"__infer_inner_destructor_~X#X#destructor_scope#(668994462409357749).70a8f95641703eb0541060f9b22c82f3_2" [label="2: Exit destructor_scope::X::__infer_inner_destructor_~X \n  " color=yellow style=filled]
 	
 
-"~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_1" [label="1: Start destructor_scope::X::~X\nFormals:  this:destructor_scope::X*\nLocals:  \n  " color=yellow style=filled]
+"~X#X#destructor_scope#(668994462409357749).ef7f60e26033e09d802610103a60d690_1" [label="1: Start destructor_scope::X::~X\nFormals:  this:destructor_scope::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_1" -> "~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_3" ;
-"~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_2" [label="2: Exit destructor_scope::X::~X \n  " color=yellow style=filled]
+	 "~X#X#destructor_scope#(668994462409357749).ef7f60e26033e09d802610103a60d690_1" -> "~X#X#destructor_scope#(668994462409357749).ef7f60e26033e09d802610103a60d690_3" ;
+"~X#X#destructor_scope#(668994462409357749).ef7f60e26033e09d802610103a60d690_2" [label="2: Exit destructor_scope::X::~X \n  " color=yellow style=filled]
 	
 
-"~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::X* [line 10, column 9]\n  _=*n$0:destructor_scope::X [line 10, column 9]\n  n$2=_fun_destructor_scope::X::__infer_inner_destructor_~X(n$0:destructor_scope::X*) injected [line 10, column 9]\n " shape="box"]
+"~X#X#destructor_scope#(668994462409357749).ef7f60e26033e09d802610103a60d690_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::X* [line 10, column 9]\n  _=*n$0:destructor_scope::X [line 10, column 9]\n  n$2=_fun_destructor_scope::X::__infer_inner_destructor_~X(n$0:destructor_scope::X*) injected [line 10, column 9]\n " shape="box"]
 	
 
-	 "~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_3" -> "~X#X#destructor_scope#(17752465063768331075).e9440dc26d00e6a493a0ae5908b3f399_2" ;
-"Y#Y#destructor_scope#{15345452000440546376|constexpr}.7b3401cb4ba53beb88d6ca2de7e20249_1" [label="1: Start destructor_scope::Y::Y\nFormals:  this:destructor_scope::Y*\nLocals:  \n  " color=yellow style=filled]
+	 "~X#X#destructor_scope#(668994462409357749).ef7f60e26033e09d802610103a60d690_3" -> "~X#X#destructor_scope#(668994462409357749).ef7f60e26033e09d802610103a60d690_2" ;
+"Y#Y#destructor_scope#{15856921719997813945|constexpr}.1713ed83b20bec9041b01aa6e0c9e5ff_1" [label="1: Start destructor_scope::Y::Y\nFormals:  this:destructor_scope::Y*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#destructor_scope#{15345452000440546376|constexpr}.7b3401cb4ba53beb88d6ca2de7e20249_1" -> "Y#Y#destructor_scope#{15345452000440546376|constexpr}.7b3401cb4ba53beb88d6ca2de7e20249_2" ;
-"Y#Y#destructor_scope#{15345452000440546376|constexpr}.7b3401cb4ba53beb88d6ca2de7e20249_2" [label="2: Exit destructor_scope::Y::Y \n  " color=yellow style=filled]
+	 "Y#Y#destructor_scope#{15856921719997813945|constexpr}.1713ed83b20bec9041b01aa6e0c9e5ff_1" -> "Y#Y#destructor_scope#{15856921719997813945|constexpr}.1713ed83b20bec9041b01aa6e0c9e5ff_2" ;
+"Y#Y#destructor_scope#{15856921719997813945|constexpr}.1713ed83b20bec9041b01aa6e0c9e5ff_2" [label="2: Exit destructor_scope::Y::Y \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~Y#Y#destructor_scope#(1552422738585060844).721fb5af17f63315cc8e6bdcce2453e5_1" [label="1: Start destructor_scope::Y::__infer_inner_destructor_~Y\nFormals:  this:destructor_scope::Y*\nLocals:  \n  " color=yellow style=filled]
+"__infer_inner_destructor_~Y#Y#destructor_scope#(2800572945438141590).f330a3f57ed3335f95bc0ee40e778e40_1" [label="1: Start destructor_scope::Y::__infer_inner_destructor_~Y\nFormals:  this:destructor_scope::Y*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~Y#Y#destructor_scope#(1552422738585060844).721fb5af17f63315cc8e6bdcce2453e5_1" -> "__infer_inner_destructor_~Y#Y#destructor_scope#(1552422738585060844).721fb5af17f63315cc8e6bdcce2453e5_2" ;
-"__infer_inner_destructor_~Y#Y#destructor_scope#(1552422738585060844).721fb5af17f63315cc8e6bdcce2453e5_2" [label="2: Exit destructor_scope::Y::__infer_inner_destructor_~Y \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~Y#Y#destructor_scope#(2800572945438141590).f330a3f57ed3335f95bc0ee40e778e40_1" -> "__infer_inner_destructor_~Y#Y#destructor_scope#(2800572945438141590).f330a3f57ed3335f95bc0ee40e778e40_2" ;
+"__infer_inner_destructor_~Y#Y#destructor_scope#(2800572945438141590).f330a3f57ed3335f95bc0ee40e778e40_2" [label="2: Exit destructor_scope::Y::__infer_inner_destructor_~Y \n  " color=yellow style=filled]
 	
 
-"~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_1" [label="1: Start destructor_scope::Y::~Y\nFormals:  this:destructor_scope::Y*\nLocals:  \n  " color=yellow style=filled]
+"~Y#Y#destructor_scope#(2800572945438141590).a420416a0cd313cac953e043f0404d61_1" [label="1: Start destructor_scope::Y::~Y\nFormals:  this:destructor_scope::Y*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_1" -> "~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_3" ;
-"~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_2" [label="2: Exit destructor_scope::Y::~Y \n  " color=yellow style=filled]
+	 "~Y#Y#destructor_scope#(2800572945438141590).a420416a0cd313cac953e043f0404d61_1" -> "~Y#Y#destructor_scope#(2800572945438141590).a420416a0cd313cac953e043f0404d61_3" ;
+"~Y#Y#destructor_scope#(2800572945438141590).a420416a0cd313cac953e043f0404d61_2" [label="2: Exit destructor_scope::Y::~Y \n  " color=yellow style=filled]
 	
 
-"~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::Y* [line 14, column 9]\n  _=*n$0:destructor_scope::Y [line 14, column 9]\n  n$2=_fun_destructor_scope::Y::__infer_inner_destructor_~Y(n$0:destructor_scope::Y*) injected [line 14, column 9]\n " shape="box"]
+"~Y#Y#destructor_scope#(2800572945438141590).a420416a0cd313cac953e043f0404d61_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:destructor_scope::Y* [line 14, column 9]\n  _=*n$0:destructor_scope::Y [line 14, column 9]\n  n$2=_fun_destructor_scope::Y::__infer_inner_destructor_~Y(n$0:destructor_scope::Y*) injected [line 14, column 9]\n " shape="box"]
 	
 
-	 "~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_3" -> "~Y#Y#destructor_scope#(1552422738585060844).f631a64648f2fd67ee421a0da2149c2a_2" ;
-"Z#Z#destructor_scope#{18164697736739450765|constexpr}.d06f6f2e94b3e6404a0952bf77a2514e_1" [label="1: Start destructor_scope::Z::Z\nFormals:  this:destructor_scope::Z*\nLocals:  \n  " color=yellow style=filled]
+	 "~Y#Y#destructor_scope#(2800572945438141590).a420416a0cd313cac953e043f0404d61_3" -> "~Y#Y#destructor_scope#(2800572945438141590).a420416a0cd313cac953e043f0404d61_2" ;
+"Z#Z#destructor_scope#{11857695729037403777|constexpr}.cf284ca59fcb40e2e0c4ebe1d6bce51e_1" [label="1: Start destructor_scope::Z::Z\nFormals:  this:destructor_scope::Z* __param_0:destructor_scope::Z&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Z#Z#destructor_scope#{18164697736739450765|constexpr}.d06f6f2e94b3e6404a0952bf77a2514e_1" -> "Z#Z#destructor_scope#{18164697736739450765|constexpr}.d06f6f2e94b3e6404a0952bf77a2514e_2" ;
-"Z#Z#destructor_scope#{18164697736739450765|constexpr}.d06f6f2e94b3e6404a0952bf77a2514e_2" [label="2: Exit destructor_scope::Z::Z \n  " color=yellow style=filled]
+	 "Z#Z#destructor_scope#{11857695729037403777|constexpr}.cf284ca59fcb40e2e0c4ebe1d6bce51e_1" -> "Z#Z#destructor_scope#{11857695729037403777|constexpr}.cf284ca59fcb40e2e0c4ebe1d6bce51e_2" ;
+"Z#Z#destructor_scope#{11857695729037403777|constexpr}.cf284ca59fcb40e2e0c4ebe1d6bce51e_2" [label="2: Exit destructor_scope::Z::Z \n  " color=yellow style=filled]
 	
 
-"Z#Z#destructor_scope#{8043287043140791634|constexpr}.7d5fabaed2fb79e3cac825824cb16f47_1" [label="1: Start destructor_scope::Z::Z\nFormals:  this:destructor_scope::Z* __param_0:destructor_scope::Z&\nLocals:  \n  " color=yellow style=filled]
+"Z#Z#destructor_scope#{17668673956532263724|constexpr}.e870615cac93491da417f5f76b27451b_1" [label="1: Start destructor_scope::Z::Z\nFormals:  this:destructor_scope::Z*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Z#Z#destructor_scope#{8043287043140791634|constexpr}.7d5fabaed2fb79e3cac825824cb16f47_1" -> "Z#Z#destructor_scope#{8043287043140791634|constexpr}.7d5fabaed2fb79e3cac825824cb16f47_2" ;
-"Z#Z#destructor_scope#{8043287043140791634|constexpr}.7d5fabaed2fb79e3cac825824cb16f47_2" [label="2: Exit destructor_scope::Z::Z \n  " color=yellow style=filled]
+	 "Z#Z#destructor_scope#{17668673956532263724|constexpr}.e870615cac93491da417f5f76b27451b_1" -> "Z#Z#destructor_scope#{17668673956532263724|constexpr}.e870615cac93491da417f5f76b27451b_2" ;
+"Z#Z#destructor_scope#{17668673956532263724|constexpr}.e870615cac93491da417f5f76b27451b_2" [label="2: Exit destructor_scope::Z::Z \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/destructors/simple_decl.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/destructors/simple_decl.cpp.dot
index 99411bf23..d03e39822 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/destructors/simple_decl.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/destructors/simple_decl.cpp.dot
@@ -1,47 +1,47 @@
 /* @generated */
 digraph cfg {
-"__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_1" [label="1: Start A::__infer_inner_destructor_~A\nFormals:  this:A*\nLocals:  \n  " color=yellow style=filled]
+"__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_1" [label="1: Start A::__infer_inner_destructor_~A\nFormals:  this:A*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_1" -> "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" ;
-"__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_2" [label="2: Exit A::__infer_inner_destructor_~A \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_1" -> "__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_3" ;
+"__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_2" [label="2: Exit A::__infer_inner_destructor_~A \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$2=*&this:A* [line 10, column 10]\n  *n$2.f:int=0 [line 10, column 10]\n " shape="box"]
+"__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$2=*&this:A* [line 10, column 10]\n  *n$2.f:int=0 [line 10, column 10]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_3" -> "__infer_inner_destructor_~A#A#(5328378654181921475).fc82b49c4db05388a691369e292a802b_2" ;
-"~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_1" [label="1: Start A::~A\nFormals:  this:A*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_3" -> "__infer_inner_destructor_~A#A#(6691652126532499765).afef2f12d7064cc4c0235f2b8111b00d_2" ;
+"~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_1" [label="1: Start A::~A\nFormals:  this:A*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_1" -> "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" ;
-"~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_2" [label="2: Exit A::~A \n  " color=yellow style=filled]
+	 "~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_1" -> "~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_3" ;
+"~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_2" [label="2: Exit A::~A \n  " color=yellow style=filled]
 	
 
-"~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:A* [line 10, column 17]\n  _=*n$0:A [line 10, column 17]\n  n$2=_fun_A::__infer_inner_destructor_~A(n$0:A*) injected [line 10, column 17]\n " shape="box"]
+"~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:A* [line 10, column 17]\n  _=*n$0:A [line 10, column 17]\n  n$2=_fun_A::__infer_inner_destructor_~A(n$0:A*) injected [line 10, column 17]\n " shape="box"]
 	
 
-	 "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_3" -> "~A#A#(5328378654181921475).cff4808f235f4b18d15ccd10cb1df4ff_2" ;
-"__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_1" [label="1: Start B::__infer_inner_destructor_~B\nFormals:  this:B*\nLocals:  \n  " color=yellow style=filled]
+	 "~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_3" -> "~A#A#(6691652126532499765).19ead045660e733f757e973def76ed96_2" ;
+"__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_1" [label="1: Start B::__infer_inner_destructor_~B\nFormals:  this:B*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_1" -> "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" ;
-"__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_2" [label="2: Exit B::__infer_inner_destructor_~B \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_1" -> "__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_3" ;
+"__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_2" [label="2: Exit B::__infer_inner_destructor_~B \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" [label="3:  BinaryOperatorStmt: Assign \n   n$2=*&this:B* [line 18, column 11]\n  *n$2.f:int=1 [line 18, column 11]\n " shape="box"]
+"__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_3" [label="3:  BinaryOperatorStmt: Assign \n   n$2=*&this:B* [line 18, column 11]\n  *n$2.f:int=1 [line 18, column 11]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_3" -> "__infer_inner_destructor_~B#B#(7876366742276079110).fe5e2468da434006eca91d5190796d09_2" ;
-"~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_1" [label="1: Start B::~B\nFormals:  this:B*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_3" -> "__infer_inner_destructor_~B#B#(6627935060446176348).0eaac84399186c54d21f6ba7616237de_2" ;
+"~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_1" [label="1: Start B::~B\nFormals:  this:B*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_1" -> "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" ;
-"~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_2" [label="2: Exit B::~B \n  " color=yellow style=filled]
+	 "~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_1" -> "~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_3" ;
+"~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_2" [label="2: Exit B::~B \n  " color=yellow style=filled]
 	
 
-"~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:B* [line 18, column 18]\n  _=*n$0:B [line 18, column 18]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:B*) injected [line 18, column 18]\n " shape="box"]
+"~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:B* [line 18, column 18]\n  _=*n$0:B [line 18, column 18]\n  n$2=_fun_B::__infer_inner_destructor_~B(n$0:B*) injected [line 18, column 18]\n " shape="box"]
 	
 
-	 "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_3" -> "~B#B#(7876366742276079110).576ee7cb70a3e3453b3760583a94887e_2" ;
+	 "~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_3" -> "~B#B#(6627935060446176348).797bf4e3099d233e3a0e8e618abf5019_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/globals/global_const1.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/globals/global_const1.cpp.dot
index 150f7cce3..b04dcaba6 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/globals/global_const1.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/globals/global_const1.cpp.dot
@@ -60,18 +60,18 @@ digraph cfg {
 	
 
 	 "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_5" -> "test2#3587805488049044947.69e45cfdc4e36a6f741ce3985858724b_3" ;
-"X#X#{11474741413113936247|constexpr}.31759ca8626d769f5d4e50690b180278_1" [label="1: Start X::X\nFormals:  this:X* __param_0:X const &\nLocals:  \n  " color=yellow style=filled]
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_1" [label="1: Start X::X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#{11474741413113936247|constexpr}.31759ca8626d769f5d4e50690b180278_1" -> "X#X#{11474741413113936247|constexpr}.31759ca8626d769f5d4e50690b180278_2" ;
-"X#X#{11474741413113936247|constexpr}.31759ca8626d769f5d4e50690b180278_2" [label="2: Exit X::X \n  " color=yellow style=filled]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_1" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_2" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_2" [label="2: Exit X::X \n  " color=yellow style=filled]
 	
 
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_1" [label="1: Start X::X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#{7390596848467712836|constexpr}.aed44b8858ed9121cbee82ac33676d51_1" [label="1: Start X::X\nFormals:  this:X* __param_0:X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_1" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" [label="2: Exit X::X \n  " color=yellow style=filled]
+	 "X#X#{7390596848467712836|constexpr}.aed44b8858ed9121cbee82ac33676d51_1" -> "X#X#{7390596848467712836|constexpr}.aed44b8858ed9121cbee82ac33676d51_2" ;
+"X#X#{7390596848467712836|constexpr}.aed44b8858ed9121cbee82ac33676d51_2" [label="2: Exit X::X \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot
index 174d39058..3cd7c3969 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/include_header/include_templ.cpp.dot
@@ -85,11 +85,11 @@ digraph cfg {
 	
 
 	 "div0#B<int>#(9546261644456360892).132a3992ba75c40ad8966e1504521d7d_3" -> "div0#B<int>#(9546261644456360892).132a3992ba75c40ad8966e1504521d7d_2" ;
-"B#B<int>#{17682530858649742785|constexpr}.578f27c1234efbc7eadc69dc4ca9042c_1" [label="1: Start B<int>::B\nFormals:  this:B<int>*\nLocals:  \n  " color=yellow style=filled]
+"B#B<int>#{17048865814803838320|constexpr}.6fc9503527a0545a4f093623822d47c7_1" [label="1: Start B<int>::B\nFormals:  this:B<int>*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "B#B<int>#{17682530858649742785|constexpr}.578f27c1234efbc7eadc69dc4ca9042c_1" -> "B#B<int>#{17682530858649742785|constexpr}.578f27c1234efbc7eadc69dc4ca9042c_2" ;
-"B#B<int>#{17682530858649742785|constexpr}.578f27c1234efbc7eadc69dc4ca9042c_2" [label="2: Exit B<int>::B \n  " color=yellow style=filled]
+	 "B#B<int>#{17048865814803838320|constexpr}.6fc9503527a0545a4f093623822d47c7_1" -> "B#B<int>#{17048865814803838320|constexpr}.6fc9503527a0545a4f093623822d47c7_2" ;
+"B#B<int>#{17048865814803838320|constexpr}.6fc9503527a0545a4f093623822d47c7_2" [label="2: Exit B<int>::B \n  " color=yellow style=filled]
 	
 
 "div0#B<A>#(10848361513712066289).6e41f7aae5452f098d414bfe7ad8cf85_1" [label="1: Start B<A>::div0\nFormals:  this:B<A>*\nLocals:  \n  " color=yellow style=filled]
@@ -103,11 +103,11 @@ digraph cfg {
 	
 
 	 "div0#B<A>#(10848361513712066289).6e41f7aae5452f098d414bfe7ad8cf85_3" -> "div0#B<A>#(10848361513712066289).6e41f7aae5452f098d414bfe7ad8cf85_2" ;
-"B#B<A>#{9925592449220811998|constexpr}.262c24bdb23f603bce26438cb30cea71_1" [label="1: Start B<A>::B\nFormals:  this:B<A>*\nLocals:  \n  " color=yellow style=filled]
+"B#B<A>#{8055040595638949571|constexpr}.c1367938e3b90e72d7c119136b0e0884_1" [label="1: Start B<A>::B\nFormals:  this:B<A>*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "B#B<A>#{9925592449220811998|constexpr}.262c24bdb23f603bce26438cb30cea71_1" -> "B#B<A>#{9925592449220811998|constexpr}.262c24bdb23f603bce26438cb30cea71_2" ;
-"B#B<A>#{9925592449220811998|constexpr}.262c24bdb23f603bce26438cb30cea71_2" [label="2: Exit B<A>::B \n  " color=yellow style=filled]
+	 "B#B<A>#{8055040595638949571|constexpr}.c1367938e3b90e72d7c119136b0e0884_1" -> "B#B<A>#{8055040595638949571|constexpr}.c1367938e3b90e72d7c119136b0e0884_2" ;
+"B#B<A>#{8055040595638949571|constexpr}.c1367938e3b90e72d7c119136b0e0884_2" [label="2: Exit B<A>::B \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/initialization/inheriting_constructor.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/initialization/inheriting_constructor.cpp.dot
index 9ed77d6ce..77ea660b1 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/initialization/inheriting_constructor.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/initialization/inheriting_constructor.cpp.dot
@@ -18,26 +18,26 @@ digraph cfg {
 "foo#A#(11285596688767843576).de1b7dc3a8a24aa7cc49648c6a039113_2" [label="2: Exit A::foo \n  " color=yellow style=filled]
 	
 
-"A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_1" [label="1: Start A::A\nFormals:  this:A* __param_0:int\nLocals:  \n  " color=yellow style=filled]
+"A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_1" [label="1: Start A::A\nFormals:  this:A* __param_0:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_1" -> "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_2" ;
-"A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_2" [label="2: Exit A::A \n  " color=yellow style=filled]
+	 "A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_1" -> "A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_2" ;
+"A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_2" [label="2: Exit A::A \n  " color=yellow style=filled]
 	
 
-"A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_1" [label="1: Start B::A\nFormals:  this:B* __param_0:int\nLocals:  \n  " color=yellow style=filled]
+"A#B#{5352909623164416057}.84d40d31229db9b7e97d7ad7f6d5f17d_1" [label="1: Start B::A\nFormals:  this:B* __param_0:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_1" -> "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" ;
-"A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_2" [label="2: Exit B::A \n  " color=yellow style=filled]
+	 "A#B#{5352909623164416057}.84d40d31229db9b7e97d7ad7f6d5f17d_1" -> "A#B#{5352909623164416057}.84d40d31229db9b7e97d7ad7f6d5f17d_3" ;
+"A#B#{5352909623164416057}.84d40d31229db9b7e97d7ad7f6d5f17d_2" [label="2: Exit B::A \n  " color=yellow style=filled]
 	
 
-"A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 13, column 12]\n " shape="box"]
+"A#B#{5352909623164416057}.84d40d31229db9b7e97d7ad7f6d5f17d_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 13, column 12]\n " shape="box"]
 	
 
-	 "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_3" -> "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_4" ;
-"A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_4" [label="4:  Constructor Init \n   n$3=*&__param_0:int [line 13, column 12]\n  n$2=_fun_A::A(n$1:B*,n$3:int) [line 13, column 12]\n " shape="box"]
+	 "A#B#{5352909623164416057}.84d40d31229db9b7e97d7ad7f6d5f17d_3" -> "A#B#{5352909623164416057}.84d40d31229db9b7e97d7ad7f6d5f17d_4" ;
+"A#B#{5352909623164416057}.84d40d31229db9b7e97d7ad7f6d5f17d_4" [label="4:  Constructor Init \n   n$3=*&__param_0:int [line 13, column 12]\n  n$2=_fun_A::A(n$1:B*,n$3:int) [line 13, column 12]\n " shape="box"]
 	
 
-	 "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_4" -> "A#B#{18258347749069050656}.8db05fedcc195ce779d29dca399277d8_2" ;
+	 "A#B#{5352909623164416057}.84d40d31229db9b7e97d7ad7f6d5f17d_4" -> "A#B#{5352909623164416057}.84d40d31229db9b7e97d7ad7f6d5f17d_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/initialization/init_list.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/initialization/init_list.cpp.dot
index b6d0b69b0..48291e41a 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/initialization/init_list.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/initialization/init_list.cpp.dot
@@ -114,110 +114,110 @@ digraph cfg {
 "f#C#init_list#(17813515084368904036).f077ed1f0db2e84c012845f48373d63b_2" [label="2: Exit init_list::C::f \n  " color=yellow style=filled]
 	
 
-"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_1" [label="1: Start init_list::C::C\nFormals:  this:init_list::C* a:int b:int x:init_list::X const &\nLocals:  \n  " color=yellow style=filled]
+"C#C#init_list#{2078137693366693442}.8c327f8d277d54db4e65b8ab2016ae1f_1" [label="1: Start init_list::C::C\nFormals:  this:init_list::C*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_1" -> "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_5" ;
-"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_2" [label="2: Exit init_list::C::C \n  " color=yellow style=filled]
+	 "C#C#init_list#{2078137693366693442}.8c327f8d277d54db4e65b8ab2016ae1f_1" -> "C#C#init_list#{2078137693366693442}.8c327f8d277d54db4e65b8ab2016ae1f_3" ;
+"C#C#init_list#{2078137693366693442}.8c327f8d277d54db4e65b8ab2016ae1f_2" [label="2: Exit init_list::C::C \n  " color=yellow style=filled]
 	
 
-"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::C* [line 22, column 43]\n " shape="box"]
+"C#C#init_list#{2078137693366693442}.8c327f8d277d54db4e65b8ab2016ae1f_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::C* [line 19, column 6]\n " shape="box"]
 	
 
-	 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" -> "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" ;
-"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" [label="4:  Constructor Init \n   n$2=*&x:init_list::X const & [line 22, column 45]\n  n$3=_fun_init_list::X::X(n$1.x:init_list::X*,n$2:init_list::X const &) [line 22, column 43]\n " shape="box"]
+	 "C#C#init_list#{2078137693366693442}.8c327f8d277d54db4e65b8ab2016ae1f_3" -> "C#C#init_list#{2078137693366693442}.8c327f8d277d54db4e65b8ab2016ae1f_4" ;
+"C#C#init_list#{2078137693366693442}.8c327f8d277d54db4e65b8ab2016ae1f_4" [label="4:  Constructor Init \n   *n$1.x.a:int=0 [line 19, column 7]\n  *n$1.x.p:int*=null [line 19, column 7]\n " shape="box"]
 	
 
-	 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_4" -> "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_2" ;
-"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_5" [label="5:  Constructor Init \n   n$4=*&this:init_list::C* [line 22, column 33]\n " shape="box"]
+	 "C#C#init_list#{2078137693366693442}.8c327f8d277d54db4e65b8ab2016ae1f_4" -> "C#C#init_list#{2078137693366693442}.8c327f8d277d54db4e65b8ab2016ae1f_2" ;
+"C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_1" [label="1: Start init_list::C::C\nFormals:  this:init_list::C* a:int b:int x:init_list::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_5" -> "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_6" ;
-"C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_6" [label="6:  Constructor Init \n   n$5=*&a:int [line 22, column 35]\n  n$6=*&b:int [line 22, column 39]\n  *n$4.z:int=(n$5 + n$6) [line 22, column 33]\n " shape="box"]
+	 "C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_1" -> "C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_5" ;
+"C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_2" [label="2: Exit init_list::C::C \n  " color=yellow style=filled]
 	
 
-	 "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_6" -> "C#C#init_list#{17260491501636558446}.47559f88c2f7136a0ceafb8b6a3b78ad_3" ;
-"C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_1" [label="1: Start init_list::C::C\nFormals:  this:init_list::C*\nLocals:  \n  " color=yellow style=filled]
+"C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::C* [line 22, column 43]\n " shape="box"]
 	
 
-	 "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_1" -> "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" ;
-"C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_2" [label="2: Exit init_list::C::C \n  " color=yellow style=filled]
+	 "C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_3" -> "C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_4" ;
+"C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_4" [label="4:  Constructor Init \n   n$2=*&x:init_list::X const & [line 22, column 45]\n  n$3=_fun_init_list::X::X(n$1.x:init_list::X*,n$2:init_list::X const &) [line 22, column 43]\n " shape="box"]
 	
 
-"C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::C* [line 19, column 6]\n " shape="box"]
+	 "C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_4" -> "C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_2" ;
+"C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_5" [label="5:  Constructor Init \n   n$4=*&this:init_list::C* [line 22, column 33]\n " shape="box"]
 	
 
-	 "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_3" -> "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_4" ;
-"C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_4" [label="4:  Constructor Init \n   *n$1.x.a:int=0 [line 19, column 7]\n  *n$1.x.p:int*=null [line 19, column 7]\n " shape="box"]
+	 "C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_5" -> "C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_6" ;
+"C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_6" [label="6:  Constructor Init \n   n$5=*&a:int [line 22, column 35]\n  n$6=*&b:int [line 22, column 39]\n  *n$4.z:int=(n$5 + n$6) [line 22, column 33]\n " shape="box"]
 	
 
-	 "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_4" -> "C#C#init_list#{85179409263577607}.c3811ab730f90bddf1eefdc7ec6030b7_2" ;
-"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_1" [label="1: Start init_list::X::X\nFormals:  this:init_list::X* __param_0:init_list::X const &\nLocals:  \n  " color=yellow style=filled]
+	 "C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_6" -> "C#C#init_list#{9473316906448727589}.5e7e92edb57b7e9a206c90855ab69889_3" ;
+"X#X#init_list#{12753046806942070827}.1efd898de92870cda553b4bfbf477dc0_1" [label="1: Start init_list::X::X\nFormals:  this:init_list::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_1" -> "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_5" ;
-"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_2" [label="2: Exit init_list::X::X \n  " color=yellow style=filled]
+	 "X#X#init_list#{12753046806942070827}.1efd898de92870cda553b4bfbf477dc0_1" -> "X#X#init_list#{12753046806942070827}.1efd898de92870cda553b4bfbf477dc0_2" ;
+"X#X#init_list#{12753046806942070827}.1efd898de92870cda553b4bfbf477dc0_2" [label="2: Exit init_list::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::X* [line 8, column 8]\n " shape="box"]
+"X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_1" [label="1: Start init_list::X::X\nFormals:  this:init_list::X* __param_0:init_list::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" -> "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" ;
-"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" [label="4:  Constructor Init \n   n$2=*&__param_0:init_list::X const & [line 8, column 8]\n  n$3=*n$2.p:int* [line 8, column 8]\n  *n$1.p:int*=n$3 [line 8, column 8]\n " shape="box"]
+	 "X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_1" -> "X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_5" ;
+"X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_2" [label="2: Exit init_list::X::X \n  " color=yellow style=filled]
 	
 
-	 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_4" -> "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_2" ;
-"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_5" [label="5:  Constructor Init \n   n$4=*&this:init_list::X* [line 8, column 8]\n " shape="box"]
+"X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::X* [line 8, column 8]\n " shape="box"]
 	
 
-	 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_5" -> "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_6" ;
-"X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_6" [label="6:  Constructor Init \n   n$5=*&__param_0:init_list::X const & [line 8, column 8]\n  n$6=*n$5.a:int [line 8, column 8]\n  *n$4.a:int=n$6 [line 8, column 8]\n " shape="box"]
+	 "X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_3" -> "X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_4" ;
+"X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_4" [label="4:  Constructor Init \n   n$2=*&__param_0:init_list::X const & [line 8, column 8]\n  n$3=*n$2.p:int* [line 8, column 8]\n  *n$1.p:int*=n$3 [line 8, column 8]\n " shape="box"]
 	
 
-	 "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_6" -> "X#X#init_list#{10362293117207912357|constexpr}.5b774fb6d82792ac0bbbdbe09cdd5093_3" ;
-"X#X#init_list#{14623563476151830502}.b21008744daa797ebfd9ef4c9c105ffb_1" [label="1: Start init_list::X::X\nFormals:  this:init_list::X*\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_4" -> "X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_2" ;
+"X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_5" [label="5:  Constructor Init \n   n$4=*&this:init_list::X* [line 8, column 8]\n " shape="box"]
 	
 
-	 "X#X#init_list#{14623563476151830502}.b21008744daa797ebfd9ef4c9c105ffb_1" -> "X#X#init_list#{14623563476151830502}.b21008744daa797ebfd9ef4c9c105ffb_2" ;
-"X#X#init_list#{14623563476151830502}.b21008744daa797ebfd9ef4c9c105ffb_2" [label="2: Exit init_list::X::X \n  " color=yellow style=filled]
+	 "X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_5" -> "X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_6" ;
+"X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_6" [label="6:  Constructor Init \n   n$5=*&__param_0:init_list::X const & [line 8, column 8]\n  n$6=*n$5.a:int [line 8, column 8]\n  *n$4.a:int=n$6 [line 8, column 8]\n " shape="box"]
 	
 
-"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_1" [label="1: Start init_list::Y::Y\nFormals:  this:init_list::Y* __param_0:init_list::Y const &\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_6" -> "X#X#init_list#{7348299791177244048|constexpr}.e0e40c4dfb0949cd680f8fb5c8b2f9bb_3" ;
+"Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_1" [label="1: Start init_list::Y::Y\nFormals:  this:init_list::Y* __param_0:init_list::Y const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_1" -> "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_5" ;
-"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_2" [label="2: Exit init_list::Y::Y \n  " color=yellow style=filled]
+	 "Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_1" -> "Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_5" ;
+"Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_2" [label="2: Exit init_list::Y::Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::Y* [line 12, column 8]\n " shape="box"]
+"Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::Y* [line 12, column 8]\n " shape="box"]
 	
 
-	 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" -> "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" ;
-"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" [label="4:  Constructor Init \n   n$2=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$3=_fun_init_list::X::X(n$1.x:init_list::X*,n$2.x:init_list::X&) [line 12, column 8]\n " shape="box"]
+	 "Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_3" -> "Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_4" ;
+"Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_4" [label="4:  Constructor Init \n   n$2=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$3=_fun_init_list::X::X(n$1.x:init_list::X*,n$2.x:init_list::X&) [line 12, column 8]\n " shape="box"]
 	
 
-	 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_4" -> "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_2" ;
-"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_5" [label="5:  Constructor Init \n   n$4=*&this:init_list::Y* [line 12, column 8]\n " shape="box"]
+	 "Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_4" -> "Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_2" ;
+"Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_5" [label="5:  Constructor Init \n   n$4=*&this:init_list::Y* [line 12, column 8]\n " shape="box"]
 	
 
-	 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_5" -> "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_6" ;
-"Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_6" [label="6:  Constructor Init \n   n$5=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$6=*n$5.z:int [line 12, column 8]\n  *n$4.z:int=n$6 [line 12, column 8]\n " shape="box"]
+	 "Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_5" -> "Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_6" ;
+"Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_6" [label="6:  Constructor Init \n   n$5=*&__param_0:init_list::Y const & [line 12, column 8]\n  n$6=*n$5.z:int [line 12, column 8]\n  *n$4.z:int=n$6 [line 12, column 8]\n " shape="box"]
 	
 
-	 "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_6" -> "Y#Y#init_list#{7965727998464233870|constexpr}.d9c0a01aa3d67701ff6c6bdd6dd01f2d_3" ;
-"Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_1" [label="1: Start init_list::Y::Y\nFormals:  this:init_list::Y*\nLocals:  \n  " color=yellow style=filled]
+	 "Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_6" -> "Y#Y#init_list#{657511410642540519|constexpr}.0f66abb1c814bba756002428de3f44c3_3" ;
+"Y#Y#init_list#{8563191656710678156}.e0b0645b50ae7ca732891522c0978402_1" [label="1: Start init_list::Y::Y\nFormals:  this:init_list::Y*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_1" -> "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" ;
-"Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_2" [label="2: Exit init_list::Y::Y \n  " color=yellow style=filled]
+	 "Y#Y#init_list#{8563191656710678156}.e0b0645b50ae7ca732891522c0978402_1" -> "Y#Y#init_list#{8563191656710678156}.e0b0645b50ae7ca732891522c0978402_3" ;
+"Y#Y#init_list#{8563191656710678156}.e0b0645b50ae7ca732891522c0978402_2" [label="2: Exit init_list::Y::Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::Y* [line 12, column 8]\n " shape="box"]
+"Y#Y#init_list#{8563191656710678156}.e0b0645b50ae7ca732891522c0978402_3" [label="3:  Constructor Init \n   n$1=*&this:init_list::Y* [line 12, column 8]\n " shape="box"]
 	
 
-	 "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_3" -> "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_4" ;
-"Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_4" [label="4:  Constructor Init \n   n$2=_fun_init_list::X::X(n$1.x:init_list::X*) [line 12, column 8]\n " shape="box"]
+	 "Y#Y#init_list#{8563191656710678156}.e0b0645b50ae7ca732891522c0978402_3" -> "Y#Y#init_list#{8563191656710678156}.e0b0645b50ae7ca732891522c0978402_4" ;
+"Y#Y#init_list#{8563191656710678156}.e0b0645b50ae7ca732891522c0978402_4" [label="4:  Constructor Init \n   n$2=_fun_init_list::X::X(n$1.x:init_list::X*) [line 12, column 8]\n " shape="box"]
 	
 
-	 "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_4" -> "Y#Y#init_list#{9181657051811221357}.e663651ceaf28a9c0d59b3f85499f583_2" ;
+	 "Y#Y#init_list#{8563191656710678156}.e0b0645b50ae7ca732891522c0978402_4" -> "Y#Y#init_list#{8563191656710678156}.e0b0645b50ae7ca732891522c0978402_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/initialization/zero_init.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/initialization/zero_init.cpp.dot
index df035440b..34ec33703 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/initialization/zero_init.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/initialization/zero_init.cpp.dot
@@ -11,34 +11,34 @@ digraph cfg {
 	
 
 	 "kMaxKeys#X#__infer_globals_initializer_zero_init.cd983beeff3879de64cad137bc5d5f8c_3" -> "kMaxKeys#X#__infer_globals_initializer_zero_init.cd983beeff3879de64cad137bc5d5f8c_2" ;
-"X#X#zero_init#{277870330798338824|constexpr}.16c2d483086de887db705c1e51a1bf78_1" [label="1: Start zero_init::X::X\nFormals:  this:zero_init::X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#zero_init#{1033941805165496697|constexpr}.7135d1ffdb70a5309e5d393a07cf05c3_1" [label="1: Start zero_init::X::X\nFormals:  this:zero_init::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#zero_init#{277870330798338824|constexpr}.16c2d483086de887db705c1e51a1bf78_1" -> "X#X#zero_init#{277870330798338824|constexpr}.16c2d483086de887db705c1e51a1bf78_3" ;
-"X#X#zero_init#{277870330798338824|constexpr}.16c2d483086de887db705c1e51a1bf78_2" [label="2: Exit zero_init::X::X \n  " color=yellow style=filled]
+	 "X#X#zero_init#{1033941805165496697|constexpr}.7135d1ffdb70a5309e5d393a07cf05c3_1" -> "X#X#zero_init#{1033941805165496697|constexpr}.7135d1ffdb70a5309e5d393a07cf05c3_3" ;
+"X#X#zero_init#{1033941805165496697|constexpr}.7135d1ffdb70a5309e5d393a07cf05c3_2" [label="2: Exit zero_init::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#zero_init#{277870330798338824|constexpr}.16c2d483086de887db705c1e51a1bf78_3" [label="3:  Constructor Init \n   n$1=*&this:zero_init::X* [line 15, column 19]\n " shape="box"]
+"X#X#zero_init#{1033941805165496697|constexpr}.7135d1ffdb70a5309e5d393a07cf05c3_3" [label="3:  Constructor Init \n   n$1=*&this:zero_init::X* [line 15, column 19]\n " shape="box"]
 	
 
-	 "X#X#zero_init#{277870330798338824|constexpr}.16c2d483086de887db705c1e51a1bf78_3" -> "X#X#zero_init#{277870330798338824|constexpr}.16c2d483086de887db705c1e51a1bf78_4" ;
-"X#X#zero_init#{277870330798338824|constexpr}.16c2d483086de887db705c1e51a1bf78_4" [label="4:  Constructor Init \n   n$2=_fun___infer_zero_initialization(n$1.keys_:void*[65536*8]) [line 15, column 25]\n " shape="box"]
+	 "X#X#zero_init#{1033941805165496697|constexpr}.7135d1ffdb70a5309e5d393a07cf05c3_3" -> "X#X#zero_init#{1033941805165496697|constexpr}.7135d1ffdb70a5309e5d393a07cf05c3_4" ;
+"X#X#zero_init#{1033941805165496697|constexpr}.7135d1ffdb70a5309e5d393a07cf05c3_4" [label="4:  Constructor Init \n   n$2=_fun___infer_zero_initialization(n$1.keys_:void*[65536*8]) [line 15, column 25]\n " shape="box"]
 	
 
-	 "X#X#zero_init#{277870330798338824|constexpr}.16c2d483086de887db705c1e51a1bf78_4" -> "X#X#zero_init#{277870330798338824|constexpr}.16c2d483086de887db705c1e51a1bf78_2" ;
-"Y#Y#zero_init#{11751607535979846847|constexpr}.3d7bacd58f9f66a28604db198e91fa11_1" [label="1: Start zero_init::Y::Y\nFormals:  this:zero_init::Y*\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#zero_init#{1033941805165496697|constexpr}.7135d1ffdb70a5309e5d393a07cf05c3_4" -> "X#X#zero_init#{1033941805165496697|constexpr}.7135d1ffdb70a5309e5d393a07cf05c3_2" ;
+"Y#Y#zero_init#{13622159389561709274|constexpr}.583312d888fb250b250e29cd67a1dc36_1" [label="1: Start zero_init::Y::Y\nFormals:  this:zero_init::Y*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#zero_init#{11751607535979846847|constexpr}.3d7bacd58f9f66a28604db198e91fa11_1" -> "Y#Y#zero_init#{11751607535979846847|constexpr}.3d7bacd58f9f66a28604db198e91fa11_3" ;
-"Y#Y#zero_init#{11751607535979846847|constexpr}.3d7bacd58f9f66a28604db198e91fa11_2" [label="2: Exit zero_init::Y::Y \n  " color=yellow style=filled]
+	 "Y#Y#zero_init#{13622159389561709274|constexpr}.583312d888fb250b250e29cd67a1dc36_1" -> "Y#Y#zero_init#{13622159389561709274|constexpr}.583312d888fb250b250e29cd67a1dc36_3" ;
+"Y#Y#zero_init#{13622159389561709274|constexpr}.583312d888fb250b250e29cd67a1dc36_2" [label="2: Exit zero_init::Y::Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#zero_init#{11751607535979846847|constexpr}.3d7bacd58f9f66a28604db198e91fa11_3" [label="3:  Constructor Init \n   n$1=*&this:zero_init::Y* [line 22, column 19]\n " shape="box"]
+"Y#Y#zero_init#{13622159389561709274|constexpr}.583312d888fb250b250e29cd67a1dc36_3" [label="3:  Constructor Init \n   n$1=*&this:zero_init::Y* [line 22, column 19]\n " shape="box"]
 	
 
-	 "Y#Y#zero_init#{11751607535979846847|constexpr}.3d7bacd58f9f66a28604db198e91fa11_3" -> "Y#Y#zero_init#{11751607535979846847|constexpr}.3d7bacd58f9f66a28604db198e91fa11_4" ;
-"Y#Y#zero_init#{11751607535979846847|constexpr}.3d7bacd58f9f66a28604db198e91fa11_4" [label="4:  Constructor Init \n   *n$1.keys_[0]:void*=null [line 22, column 25]\n  *n$1.keys_[1]:void*=null [line 22, column 25]\n  *n$1.keys_[2]:void*=null [line 22, column 25]\n " shape="box"]
+	 "Y#Y#zero_init#{13622159389561709274|constexpr}.583312d888fb250b250e29cd67a1dc36_3" -> "Y#Y#zero_init#{13622159389561709274|constexpr}.583312d888fb250b250e29cd67a1dc36_4" ;
+"Y#Y#zero_init#{13622159389561709274|constexpr}.583312d888fb250b250e29cd67a1dc36_4" [label="4:  Constructor Init \n   *n$1.keys_[0]:void*=null [line 22, column 25]\n  *n$1.keys_[1]:void*=null [line 22, column 25]\n  *n$1.keys_[2]:void*=null [line 22, column 25]\n " shape="box"]
 	
 
-	 "Y#Y#zero_init#{11751607535979846847|constexpr}.3d7bacd58f9f66a28604db198e91fa11_4" -> "Y#Y#zero_init#{11751607535979846847|constexpr}.3d7bacd58f9f66a28604db198e91fa11_2" ;
+	 "Y#Y#zero_init#{13622159389561709274|constexpr}.583312d888fb250b250e29cd67a1dc36_4" -> "Y#Y#zero_init#{13622159389561709274|constexpr}.583312d888fb250b250e29cd67a1dc36_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot
index c2808d2ac..2d50be566 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/loops/foreach1.cpp.dot
@@ -146,43 +146,43 @@ digraph cfg {
 	
 
 	 "operator*#iterator#(14296957122470685412).e3f593369544fc43a253ad1e4f5ed136_4" -> "operator*#iterator#(14296957122470685412).e3f593369544fc43a253ad1e4f5ed136_2" ;
-"iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_1" [label="1: Start iterator::iterator\nFormals:  this:iterator* __param_0:iterator const &\nLocals:  \n  " color=yellow style=filled]
+"iterator#iterator#{6263800793583893213|constexpr}.79ce1743f325c6fc1a30df957a6a8e06_1" [label="1: Start iterator::iterator\nFormals:  this:iterator* __param_0:iterator const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_1" -> "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" ;
-"iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_2" [label="2: Exit iterator::iterator \n  " color=yellow style=filled]
+	 "iterator#iterator#{6263800793583893213|constexpr}.79ce1743f325c6fc1a30df957a6a8e06_1" -> "iterator#iterator#{6263800793583893213|constexpr}.79ce1743f325c6fc1a30df957a6a8e06_3" ;
+"iterator#iterator#{6263800793583893213|constexpr}.79ce1743f325c6fc1a30df957a6a8e06_2" [label="2: Exit iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" [label="3:  Constructor Init \n   n$1=*&this:iterator* [line 9, column 8]\n " shape="box"]
+"iterator#iterator#{6263800793583893213|constexpr}.79ce1743f325c6fc1a30df957a6a8e06_3" [label="3:  Constructor Init \n   n$1=*&this:iterator* [line 9, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_3" -> "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_4" ;
-"iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_4" [label="4:  Constructor Init \n   n$2=*&__param_0:iterator const & [line 9, column 8]\n  n$3=*n$2.val:int [line 9, column 8]\n  *n$1.val:int=n$3 [line 9, column 8]\n " shape="box"]
+	 "iterator#iterator#{6263800793583893213|constexpr}.79ce1743f325c6fc1a30df957a6a8e06_3" -> "iterator#iterator#{6263800793583893213|constexpr}.79ce1743f325c6fc1a30df957a6a8e06_4" ;
+"iterator#iterator#{6263800793583893213|constexpr}.79ce1743f325c6fc1a30df957a6a8e06_4" [label="4:  Constructor Init \n   n$2=*&__param_0:iterator const & [line 9, column 8]\n  n$3=*n$2.val:int [line 9, column 8]\n  *n$1.val:int=n$3 [line 9, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_4" -> "iterator#iterator#{11413353760466671846|constexpr}.a278508d3bccc69caf1a1db6246cf788_2" ;
-"iterator#iterator#{17107199916075329459}.2fc51ac860d26e778b9b34e5032f02d5_1" [label="1: Start iterator::iterator\nFormals:  this:iterator*\nLocals:  \n  " color=yellow style=filled]
+	 "iterator#iterator#{6263800793583893213|constexpr}.79ce1743f325c6fc1a30df957a6a8e06_4" -> "iterator#iterator#{6263800793583893213|constexpr}.79ce1743f325c6fc1a30df957a6a8e06_2" ;
+"iterator#iterator#{653730785817818446}.63d1626384a198c721f31181f019c163_1" [label="1: Start iterator::iterator\nFormals:  this:iterator*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "iterator#iterator#{17107199916075329459}.2fc51ac860d26e778b9b34e5032f02d5_1" -> "iterator#iterator#{17107199916075329459}.2fc51ac860d26e778b9b34e5032f02d5_2" ;
-"iterator#iterator#{17107199916075329459}.2fc51ac860d26e778b9b34e5032f02d5_2" [label="2: Exit iterator::iterator \n  " color=yellow style=filled]
+	 "iterator#iterator#{653730785817818446}.63d1626384a198c721f31181f019c163_1" -> "iterator#iterator#{653730785817818446}.63d1626384a198c721f31181f019c163_2" ;
+"iterator#iterator#{653730785817818446}.63d1626384a198c721f31181f019c163_2" [label="2: Exit iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_1" [label="1: Start iterator::iterator\nFormals:  this:iterator* __param_0:iterator&\nLocals:  \n  " color=yellow style=filled]
+"iterator#iterator#{733828176452420883|constexpr}.f8773ccedd550d047d06e0feb2177e51_1" [label="1: Start iterator::iterator\nFormals:  this:iterator* __param_0:iterator&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_1" -> "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" ;
-"iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_2" [label="2: Exit iterator::iterator \n  " color=yellow style=filled]
+	 "iterator#iterator#{733828176452420883|constexpr}.f8773ccedd550d047d06e0feb2177e51_1" -> "iterator#iterator#{733828176452420883|constexpr}.f8773ccedd550d047d06e0feb2177e51_3" ;
+"iterator#iterator#{733828176452420883|constexpr}.f8773ccedd550d047d06e0feb2177e51_2" [label="2: Exit iterator::iterator \n  " color=yellow style=filled]
 	
 
-"iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" [label="3:  Constructor Init \n   n$1=*&this:iterator* [line 9, column 8]\n " shape="box"]
+"iterator#iterator#{733828176452420883|constexpr}.f8773ccedd550d047d06e0feb2177e51_3" [label="3:  Constructor Init \n   n$1=*&this:iterator* [line 9, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_3" -> "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_4" ;
-"iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_4" [label="4:  Constructor Init \n   n$2=*&__param_0:iterator& [line 9, column 8]\n  n$3=*n$2.val:int [line 9, column 8]\n  *n$1.val:int=n$3 [line 9, column 8]\n " shape="box"]
+	 "iterator#iterator#{733828176452420883|constexpr}.f8773ccedd550d047d06e0feb2177e51_3" -> "iterator#iterator#{733828176452420883|constexpr}.f8773ccedd550d047d06e0feb2177e51_4" ;
+"iterator#iterator#{733828176452420883|constexpr}.f8773ccedd550d047d06e0feb2177e51_4" [label="4:  Constructor Init \n   n$2=*&__param_0:iterator& [line 9, column 8]\n  n$3=*n$2.val:int [line 9, column 8]\n  *n$1.val:int=n$3 [line 9, column 8]\n " shape="box"]
 	
 
-	 "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_4" -> "iterator#iterator#{3083368405611515834|constexpr}.86fcbefb2af88c097bfa7e085c4b4f40_2" ;
+	 "iterator#iterator#{733828176452420883|constexpr}.f8773ccedd550d047d06e0feb2177e51_4" -> "iterator#iterator#{733828176452420883|constexpr}.f8773ccedd550d047d06e0feb2177e51_2" ;
 "end#vec(class iterator)#(14240882620331653738).aed9da65654959634fd17d4511cfa44d_1" [label="1: Start vec::end\nFormals:  this:vec* __return_param:iterator*\nLocals:  \n  " color=yellow style=filled]
 	
 
@@ -221,35 +221,35 @@ digraph cfg {
 	
 
 	 "begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_5" -> "begin#vec(class iterator)#(1866137161906470488).407edea568a869b61c9e5e8424e0b5f7_2" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_1" [label="1: Start vec::vec\nFormals:  this:vec* size:int\nLocals:  \n  " color=yellow style=filled]
+"vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_1" [label="1: Start vec::vec\nFormals:  this:vec* size:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_1" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_7" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_2" [label="2: Exit vec::vec \n  " color=yellow style=filled]
+	 "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_1" -> "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_7" ;
+"vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_2" [label="2: Exit vec::vec \n  " color=yellow style=filled]
 	
 
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:vec* [line 24, column 5]\n  n$1=*&size:int [line 24, column 16]\n  *n$0.end_.val:int=n$1 [line 24, column 5]\n " shape="box"]
+"vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:vec* [line 24, column 5]\n  n$1=*&size:int [line 24, column 16]\n  *n$0.end_.val:int=n$1 [line 24, column 5]\n " shape="box"]
 	
 
-	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_2" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:vec* [line 23, column 5]\n  *n$2.begin_.val:int=0 [line 23, column 5]\n " shape="box"]
+	 "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_3" -> "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_2" ;
+"vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:vec* [line 23, column 5]\n  *n$2.begin_.val:int=0 [line 23, column 5]\n " shape="box"]
 	
 
-	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_3" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" [label="5:  Constructor Init \n   n$3=*&this:vec* [line 22, column 3]\n " shape="box"]
+	 "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_4" -> "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_3" ;
+"vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_5" [label="5:  Constructor Init \n   n$3=*&this:vec* [line 22, column 3]\n " shape="box"]
 	
 
-	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" [label="6:  Constructor Init \n   n$4=_fun_iterator::iterator(n$3.end_:iterator*) [line 22, column 3]\n " shape="box"]
+	 "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_5" -> "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_6" ;
+"vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_6" [label="6:  Constructor Init \n   n$4=_fun_iterator::iterator(n$3.end_:iterator*) [line 22, column 3]\n " shape="box"]
 	
 
-	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_6" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_4" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_7" [label="7:  Constructor Init \n   n$5=*&this:vec* [line 22, column 3]\n " shape="box"]
+	 "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_6" -> "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_4" ;
+"vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_7" [label="7:  Constructor Init \n   n$5=*&this:vec* [line 22, column 3]\n " shape="box"]
 	
 
-	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_7" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_8" ;
-"vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_8" [label="8:  Constructor Init \n   n$6=_fun_iterator::iterator(n$5.begin_:iterator*) [line 22, column 3]\n " shape="box"]
+	 "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_7" -> "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_8" ;
+"vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_8" [label="8:  Constructor Init \n   n$6=_fun_iterator::iterator(n$5.begin_:iterator*) [line 22, column 3]\n " shape="box"]
 	
 
-	 "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_8" -> "vec#vec#{13876720186060950809}.c3c9a518fcec87e97d6b52a59f13d428_5" ;
+	 "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_8" -> "vec#vec#{14372719777012317208}.d88ff419231dda7ed4b627518fd1a9fb_5" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/union.cpp.dot b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/union.cpp.dot
index 79a505770..4ed6e8b4c 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/union.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/frontend/nestedoperators/union.cpp.dot
@@ -38,11 +38,11 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_7" -> "main.fad58de7366495db4650cfefac2fcd61_6" ;
-"#anonymous_union_nestedoperators_union.cpp:13:1#{12517556114589879497}.421be16393d3467be45cc1c1ca7ddb2b_1" [label="1: Start anonymous_union_nestedoperators_union.cpp:13:1::\nFormals:  this:anonymous_union_nestedoperators_union.cpp:13:1*\nLocals:  \n  " color=yellow style=filled]
+"#anonymous_union_nestedoperators_union.cpp:13:1#{12006367870009433944}.af02e1032bb716becc2ad6fad0c17739_1" [label="1: Start anonymous_union_nestedoperators_union.cpp:13:1::\nFormals:  this:anonymous_union_nestedoperators_union.cpp:13:1*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#anonymous_union_nestedoperators_union.cpp:13:1#{12517556114589879497}.421be16393d3467be45cc1c1ca7ddb2b_1" -> "#anonymous_union_nestedoperators_union.cpp:13:1#{12517556114589879497}.421be16393d3467be45cc1c1ca7ddb2b_2" ;
-"#anonymous_union_nestedoperators_union.cpp:13:1#{12517556114589879497}.421be16393d3467be45cc1c1ca7ddb2b_2" [label="2: Exit anonymous_union_nestedoperators_union.cpp:13:1:: \n  " color=yellow style=filled]
+	 "#anonymous_union_nestedoperators_union.cpp:13:1#{12006367870009433944}.af02e1032bb716becc2ad6fad0c17739_1" -> "#anonymous_union_nestedoperators_union.cpp:13:1#{12006367870009433944}.af02e1032bb716becc2ad6fad0c17739_2" ;
+"#anonymous_union_nestedoperators_union.cpp:13:1#{12006367870009433944}.af02e1032bb716becc2ad6fad0c17739_2" [label="2: Exit anonymous_union_nestedoperators_union.cpp:13:1:: \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/pulse/values.cpp b/infer/tests/codetoanalyze/cpp/pulse/values.cpp
index 3db75d310..b61017a80 100644
--- a/infer/tests/codetoanalyze/cpp/pulse/values.cpp
+++ b/infer/tests/codetoanalyze/cpp/pulse/values.cpp
@@ -83,7 +83,7 @@ struct StringRange {
   char const *b_, *e_;
   StringRange() : b_(), e_(){};
   char const* data() const { return b_; }
-  std::size_t size() const { return std::size_t(e_ - b_); }
+  size_t size() const { return size_t(e_ - b_); }
 };
 
 void function_empty_range_ok() {
diff --git a/infer/tests/codetoanalyze/cpp/quandary/issues.exp b/infer/tests/codetoanalyze/cpp/quandary/issues.exp
index 5a7eb3a86..094caa14f 100644
--- a/infer/tests/codetoanalyze/cpp/quandary/issues.exp
+++ b/infer/tests/codetoanalyze/cpp/quandary/issues.exp
@@ -33,8 +33,8 @@ codetoanalyze/cpp/quandary/basics.cpp, basics::string_source_bad, 2, QUANDARY_TA
 codetoanalyze/cpp/quandary/basics.cpp, basics::taint_arg_source_bad, 3, QUANDARY_TAINT_ERROR, no_bucket, ERROR, [Return from basics::Obj::taint_arg_source,Call to __infer_taint_sink with tainted index 0]
 codetoanalyze/cpp/quandary/basics.cpp, basics::template_source_bad, 2, QUANDARY_TAINT_ERROR, no_bucket, ERROR, [Return from basics::template_source<void_*>,Call to __infer_taint_sink with tainted index 0]
 codetoanalyze/cpp/quandary/basics.cpp, basics::unsanitized_bad, 3, QUANDARY_TAINT_ERROR, no_bucket, ERROR, [Return from basics::Obj::string_source,Call to basics::Obj::string_sink with tainted index 1]
-codetoanalyze/cpp/quandary/basics.cpp, basics::via_field_bad1, 3, QUANDARY_TAINT_ERROR, no_bucket, ERROR, [Return from basics::template_source<std::basic_string<char>_>,Call to basics::template_sink<std::basic_string<char>_> with tainted index 0]
-codetoanalyze/cpp/quandary/basics.cpp, basics::via_field_bad2, 2, QUANDARY_TAINT_ERROR, no_bucket, ERROR, [Return from basics::template_source<std::basic_string<char>_>,Call to basics::template_sink<std::basic_string<char>_> with tainted index 0]
+codetoanalyze/cpp/quandary/basics.cpp, basics::via_field_bad1, 3, QUANDARY_TAINT_ERROR, no_bucket, ERROR, [Return from basics::template_source<9a770ca56aea3aef>,Call to basics::template_sink<9a770ca56aea3aef> with tainted index 0]
+codetoanalyze/cpp/quandary/basics.cpp, basics::via_field_bad2, 2, QUANDARY_TAINT_ERROR, no_bucket, ERROR, [Return from basics::template_source<9a770ca56aea3aef>,Call to basics::template_sink<9a770ca56aea3aef> with tainted index 0]
 codetoanalyze/cpp/quandary/basics.cpp, basics::via_passthrough_bad1, 4, QUANDARY_TAINT_ERROR, no_bucket, ERROR, [Return from basics::Obj::string_source,Call to basics::Obj::string_sink with tainted index 1]
 codetoanalyze/cpp/quandary/basics.cpp, basics::via_passthrough_bad2, 3, QUANDARY_TAINT_ERROR, no_bucket, ERROR, [Return from basics::Obj::string_source,Call to basics::Obj::string_sink with tainted index 1]
 codetoanalyze/cpp/quandary/endpoints.cpp, endpoints::Service1::FP_private_not_endpoint_ok, 1, SHELL_INJECTION_RISK, no_bucket, ERROR, [Return from endpoints::Service1::FP_private_not_endpoint_ok,Call to system with tainted index 0]
diff --git a/infer/tests/codetoanalyze/cpp/shared/attributes/annotate.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/attributes/annotate.cpp.dot
index f31fc0b1f..c59f08fa1 100644
--- a/infer/tests/codetoanalyze/cpp/shared/attributes/annotate.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/attributes/annotate.cpp.dot
@@ -412,15 +412,15 @@ digraph cfg {
 "getRef#TranslateAsPtr<int>#(8980454460906194048).c1f61acdfdda98d0f31dfdad70fac6a4_2" [label="2: Exit TranslateAsPtr<int>::getRef \n  " color=yellow style=filled]
 	
 
-"TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_1" [label="1: Start TranslateAsPtr<int>::TranslateAsPtr\nFormals:  this:int** t:int*\nLocals:  \n  " color=yellow style=filled]
+"TranslateAsPtr#TranslateAsPtr<int>#{13431187666758286271}.053773a0291077ea343f8d1ba949891d_1" [label="1: Start TranslateAsPtr<int>::TranslateAsPtr\nFormals:  this:int** t:int*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_1" -> "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" ;
-"TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_2" [label="2: Exit TranslateAsPtr<int>::TranslateAsPtr \n  " color=yellow style=filled]
+	 "TranslateAsPtr#TranslateAsPtr<int>#{13431187666758286271}.053773a0291077ea343f8d1ba949891d_1" -> "TranslateAsPtr#TranslateAsPtr<int>#{13431187666758286271}.053773a0291077ea343f8d1ba949891d_3" ;
+"TranslateAsPtr#TranslateAsPtr<int>#{13431187666758286271}.053773a0291077ea343f8d1ba949891d_2" [label="2: Exit TranslateAsPtr<int>::TranslateAsPtr \n  " color=yellow style=filled]
 	
 
-"TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" [label="3:  Call _fun_TranslateAsPtr<int>::setPtr \n   n$0=*&this:int** [line 76, column 36]\n  _=*n$0:int* [line 76, column 36]\n  n$2=*&t:int* [line 76, column 43]\n  n$3=_fun_TranslateAsPtr<int>::setPtr(n$0:int**,n$2:int*) [line 76, column 36]\n " shape="box"]
+"TranslateAsPtr#TranslateAsPtr<int>#{13431187666758286271}.053773a0291077ea343f8d1ba949891d_3" [label="3:  Call _fun_TranslateAsPtr<int>::setPtr \n   n$0=*&this:int** [line 76, column 36]\n  _=*n$0:int* [line 76, column 36]\n  n$2=*&t:int* [line 76, column 43]\n  n$3=_fun_TranslateAsPtr<int>::setPtr(n$0:int**,n$2:int*) [line 76, column 36]\n " shape="box"]
 	
 
-	 "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_3" -> "TranslateAsPtr#TranslateAsPtr<int>#{16989717360382977660}.33ce04b76efc158540bbe4b4b3c6897f_2" ;
+	 "TranslateAsPtr#TranslateAsPtr<int>#{13431187666758286271}.053773a0291077ea343f8d1ba949891d_3" -> "TranslateAsPtr#TranslateAsPtr<int>#{13431187666758286271}.053773a0291077ea343f8d1ba949891d_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/conditional/binary_conditional.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/conditional/binary_conditional.cpp.dot
index 1617a5b0c..5d114d5c8 100644
--- a/infer/tests/codetoanalyze/cpp/shared/conditional/binary_conditional.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/conditional/binary_conditional.cpp.dot
@@ -175,25 +175,25 @@ digraph cfg {
 	
 
 	 "operator_bool#X#binary_conditional#(663222161121279878).1074e20ff76c2575638dad4d7c1539a7_3" -> "operator_bool#X#binary_conditional#(663222161121279878).1074e20ff76c2575638dad4d7c1539a7_2" ;
-"X#X#binary_conditional#{14263889156663411855|constexpr}.2259daea109ab4ed7cb747998c1a8b38_1" [label="1: Start binary_conditional::X::X\nFormals:  this:binary_conditional::X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#binary_conditional#{14983956545993097243|constexpr}.13a5ec9d8c7205dc22870cc8a7cef45e_1" [label="1: Start binary_conditional::X::X\nFormals:  this:binary_conditional::X* __param_0:binary_conditional::X&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#binary_conditional#{14263889156663411855|constexpr}.2259daea109ab4ed7cb747998c1a8b38_1" -> "X#X#binary_conditional#{14263889156663411855|constexpr}.2259daea109ab4ed7cb747998c1a8b38_2" ;
-"X#X#binary_conditional#{14263889156663411855|constexpr}.2259daea109ab4ed7cb747998c1a8b38_2" [label="2: Exit binary_conditional::X::X \n  " color=yellow style=filled]
+	 "X#X#binary_conditional#{14983956545993097243|constexpr}.13a5ec9d8c7205dc22870cc8a7cef45e_1" -> "X#X#binary_conditional#{14983956545993097243|constexpr}.13a5ec9d8c7205dc22870cc8a7cef45e_2" ;
+"X#X#binary_conditional#{14983956545993097243|constexpr}.13a5ec9d8c7205dc22870cc8a7cef45e_2" [label="2: Exit binary_conditional::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#binary_conditional#{984623546922473120|constexpr}.75245961304dd439037ceba4c9251935_1" [label="1: Start binary_conditional::X::X\nFormals:  this:binary_conditional::X* __param_0:binary_conditional::X&\nLocals:  \n  " color=yellow style=filled]
+"X#X#binary_conditional#{16256882625138630442|constexpr}.48629076530eab10af9149c015b04938_1" [label="1: Start binary_conditional::X::X\nFormals:  this:binary_conditional::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#binary_conditional#{984623546922473120|constexpr}.75245961304dd439037ceba4c9251935_1" -> "X#X#binary_conditional#{984623546922473120|constexpr}.75245961304dd439037ceba4c9251935_2" ;
-"X#X#binary_conditional#{984623546922473120|constexpr}.75245961304dd439037ceba4c9251935_2" [label="2: Exit binary_conditional::X::X \n  " color=yellow style=filled]
+	 "X#X#binary_conditional#{16256882625138630442|constexpr}.48629076530eab10af9149c015b04938_1" -> "X#X#binary_conditional#{16256882625138630442|constexpr}.48629076530eab10af9149c015b04938_2" ;
+"X#X#binary_conditional#{16256882625138630442|constexpr}.48629076530eab10af9149c015b04938_2" [label="2: Exit binary_conditional::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#binary_conditional#{9863553346576066468|constexpr}.13550d5872419d596c3c38205883714d_1" [label="1: Start binary_conditional::X::X\nFormals:  this:binary_conditional::X* __param_0:binary_conditional::X const &\nLocals:  \n  " color=yellow style=filled]
+"X#X#binary_conditional#{9078254210141761193|constexpr}.75e8dfb872b829fb1a0edca3193e1301_1" [label="1: Start binary_conditional::X::X\nFormals:  this:binary_conditional::X* __param_0:binary_conditional::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#binary_conditional#{9863553346576066468|constexpr}.13550d5872419d596c3c38205883714d_1" -> "X#X#binary_conditional#{9863553346576066468|constexpr}.13550d5872419d596c3c38205883714d_2" ;
-"X#X#binary_conditional#{9863553346576066468|constexpr}.13550d5872419d596c3c38205883714d_2" [label="2: Exit binary_conditional::X::X \n  " color=yellow style=filled]
+	 "X#X#binary_conditional#{9078254210141761193|constexpr}.75e8dfb872b829fb1a0edca3193e1301_1" -> "X#X#binary_conditional#{9078254210141761193|constexpr}.75e8dfb872b829fb1a0edca3193e1301_2" ;
+"X#X#binary_conditional#{9078254210141761193|constexpr}.75e8dfb872b829fb1a0edca3193e1301_2" [label="2: Exit binary_conditional::X::X \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_array.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_array.cpp.dot
index 300a7425f..3b1a9390a 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_array.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_array.cpp.dot
@@ -116,67 +116,67 @@ digraph cfg {
 	
 
 	 "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_10" -> "matrix_of_person#2881910427017022824.27f7f148c4911c13b3061cef6fe2673d_5" ;
-"Person#Person#{13294141311747224102}.29587c0ac2200b59d0b19a07fdc656e5_1" [label="1: Start Person::Person\nFormals:  this:Person*\nLocals:  \n  " color=yellow style=filled]
+"Person#Person#{11423624642537464427}.7f461a5435715e0c2250aaeeb522644b_1" [label="1: Start Person::Person\nFormals:  this:Person*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Person#Person#{13294141311747224102}.29587c0ac2200b59d0b19a07fdc656e5_1" -> "Person#Person#{13294141311747224102}.29587c0ac2200b59d0b19a07fdc656e5_2" ;
-"Person#Person#{13294141311747224102}.29587c0ac2200b59d0b19a07fdc656e5_2" [label="2: Exit Person::Person \n  " color=yellow style=filled]
+	 "Person#Person#{11423624642537464427}.7f461a5435715e0c2250aaeeb522644b_1" -> "Person#Person#{11423624642537464427}.7f461a5435715e0c2250aaeeb522644b_2" ;
+"Person#Person#{11423624642537464427}.7f461a5435715e0c2250aaeeb522644b_2" [label="2: Exit Person::Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_1" [label="1: Start Person::Person\nFormals:  this:Person* i:int\nLocals:  \n  " color=yellow style=filled]
+"Person#Person#{11423638936188631170}.cbf379a3b60d914d0b075bf1b5c51270_1" [label="1: Start Person::Person\nFormals:  this:Person* i:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_1" -> "Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_3" ;
-"Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_2" [label="2: Exit Person::Person \n  " color=yellow style=filled]
+	 "Person#Person#{11423638936188631170}.cbf379a3b60d914d0b075bf1b5c51270_1" -> "Person#Person#{11423638936188631170}.cbf379a3b60d914d0b075bf1b5c51270_3" ;
+"Person#Person#{11423638936188631170}.cbf379a3b60d914d0b075bf1b5c51270_2" [label="2: Exit Person::Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:Person* [line 10, column 19]\n  n$1=*&i:int [line 10, column 23]\n  *n$0.x:int=n$1 [line 10, column 19]\n " shape="box"]
+"Person#Person#{11423638936188631170}.cbf379a3b60d914d0b075bf1b5c51270_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:Person* [line 10, column 19]\n  n$1=*&i:int [line 10, column 23]\n  *n$0.x:int=n$1 [line 10, column 19]\n " shape="box"]
 	
 
-	 "Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_3" -> "Person#Person#{13294170998561185799}.33e91269ce59e5b361de941ed03c6643_2" ;
-"Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_1" [label="1: Start Person::Person\nFormals:  this:Person* __param_0:Person&\nLocals:  \n  " color=yellow style=filled]
+	 "Person#Person#{11423638936188631170}.cbf379a3b60d914d0b075bf1b5c51270_3" -> "Person#Person#{11423638936188631170}.cbf379a3b60d914d0b075bf1b5c51270_2" ;
+"Person#Person#{2912364444240684306|constexpr}.5cd8f77a6f3672abc87f3d40b72cc386_1" [label="1: Start Person::Person\nFormals:  this:Person* __param_0:Person&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_1" -> "Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_3" ;
-"Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_2" [label="2: Exit Person::Person \n  " color=yellow style=filled]
+	 "Person#Person#{2912364444240684306|constexpr}.5cd8f77a6f3672abc87f3d40b72cc386_1" -> "Person#Person#{2912364444240684306|constexpr}.5cd8f77a6f3672abc87f3d40b72cc386_3" ;
+"Person#Person#{2912364444240684306|constexpr}.5cd8f77a6f3672abc87f3d40b72cc386_2" [label="2: Exit Person::Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_3" [label="3:  Constructor Init \n   n$1=*&this:Person* [line 8, column 7]\n " shape="box"]
+"Person#Person#{2912364444240684306|constexpr}.5cd8f77a6f3672abc87f3d40b72cc386_3" [label="3:  Constructor Init \n   n$1=*&this:Person* [line 8, column 7]\n " shape="box"]
 	
 
-	 "Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_3" -> "Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_4" ;
-"Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Person& [line 8, column 7]\n  n$3=*n$2.x:int [line 8, column 7]\n  *n$1.x:int=n$3 [line 8, column 7]\n " shape="box"]
+	 "Person#Person#{2912364444240684306|constexpr}.5cd8f77a6f3672abc87f3d40b72cc386_3" -> "Person#Person#{2912364444240684306|constexpr}.5cd8f77a6f3672abc87f3d40b72cc386_4" ;
+"Person#Person#{2912364444240684306|constexpr}.5cd8f77a6f3672abc87f3d40b72cc386_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Person& [line 8, column 7]\n  n$3=*n$2.x:int [line 8, column 7]\n  *n$1.x:int=n$3 [line 8, column 7]\n " shape="box"]
 	
 
-	 "Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_4" -> "Person#Person#{14928211719836437323|constexpr}.702b3fbc6c128973c192111cbb802edd_2" ;
-"Z#Z#{733480695536199502}.d7175b729ebcbd1d5a54386c5c573d33_1" [label="1: Start Z::Z\nFormals:  this:Z*\nLocals:  \n  " color=yellow style=filled]
+	 "Person#Person#{2912364444240684306|constexpr}.5cd8f77a6f3672abc87f3d40b72cc386_4" -> "Person#Person#{2912364444240684306|constexpr}.5cd8f77a6f3672abc87f3d40b72cc386_2" ;
+"Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_1" [label="1: Start Z::Z\nFormals:  this:Z* __param_0:Z const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Z#Z#{733480695536199502}.d7175b729ebcbd1d5a54386c5c573d33_1" -> "Z#Z#{733480695536199502}.d7175b729ebcbd1d5a54386c5c573d33_2" ;
-"Z#Z#{733480695536199502}.d7175b729ebcbd1d5a54386c5c573d33_2" [label="2: Exit Z::Z \n  " color=yellow style=filled]
+	 "Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_1" -> "Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_5" ;
+"Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_2" [label="2: Exit Z::Z \n  " color=yellow style=filled]
 	
 
-"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_1" [label="1: Start Z::Z\nFormals:  this:Z* __param_0:Z const &\nLocals:  \n  " color=yellow style=filled]
+"Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_3" [label="3:  Constructor Init \n   n$1=*&this:Z* [line 25, column 8]\n " shape="box"]
 	
 
-	 "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_1" -> "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_5" ;
-"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_2" [label="2: Exit Z::Z \n  " color=yellow style=filled]
+	 "Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_3" -> "Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_4" ;
+"Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Z const & [line 25, column 8]\n  n$3=*n$2.b:int [line 25, column 8]\n  *n$1.b:int=n$3 [line 25, column 8]\n " shape="box"]
 	
 
-"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_3" [label="3:  Constructor Init \n   n$1=*&this:Z* [line 25, column 8]\n " shape="box"]
+	 "Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_4" -> "Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_2" ;
+"Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_5" [label="5:  Constructor Init \n   n$4=*&this:Z* [line 25, column 8]\n " shape="box"]
 	
 
-	 "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_3" -> "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_4" ;
-"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Z const & [line 25, column 8]\n  n$3=*n$2.b:int [line 25, column 8]\n  *n$1.b:int=n$3 [line 25, column 8]\n " shape="box"]
+	 "Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_5" -> "Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_6" ;
+"Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_6" [label="6:  Constructor Init \n   n$5=*&__param_0:Z const & [line 25, column 8]\n  n$6=*n$5.a:int [line 25, column 8]\n  *n$4.a:int=n$6 [line 25, column 8]\n " shape="box"]
 	
 
-	 "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_4" -> "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_2" ;
-"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_5" [label="5:  Constructor Init \n   n$4=*&this:Z* [line 25, column 8]\n " shape="box"]
+	 "Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_6" -> "Z#Z#{14712705283456466662|constexpr}.1fd4b0a382880f645dd342d336cf5c24_3" ;
+"Z#Z#{17186949825793710515}.4f5f013ea73678da4b5b72cffd051cd2_1" [label="1: Start Z::Z\nFormals:  this:Z*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_5" -> "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_6" ;
-"Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_6" [label="6:  Constructor Init \n   n$5=*&__param_0:Z const & [line 25, column 8]\n  n$6=*n$5.a:int [line 25, column 8]\n  *n$4.a:int=n$6 [line 25, column 8]\n " shape="box"]
+	 "Z#Z#{17186949825793710515}.4f5f013ea73678da4b5b72cffd051cd2_1" -> "Z#Z#{17186949825793710515}.4f5f013ea73678da4b5b72cffd051cd2_2" ;
+"Z#Z#{17186949825793710515}.4f5f013ea73678da4b5b72cffd051cd2_2" [label="2: Exit Z::Z \n  " color=yellow style=filled]
 	
 
-	 "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_6" -> "Z#Z#{9563152316573688029|constexpr}.befec20c7675cc0f4c49f58f88b8946e_3" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_default_arg.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_default_arg.cpp.dot
index c2f61a370..e1c4e984a 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_default_arg.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_default_arg.cpp.dot
@@ -34,15 +34,15 @@ digraph cfg {
 	
 
 	 "div#X#(18085298371773708552).78228fdd912ebeeb718ac23bdc727c87_4" -> "div#X#(18085298371773708552).78228fdd912ebeeb718ac23bdc727c87_2" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_1" [label="1: Start X::X\nFormals:  this:X* a:int b:int\nLocals:  \n  " color=yellow style=filled]
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_1" [label="1: Start X::X\nFormals:  this:X* a:int b:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_1" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_2" [label="2: Exit X::X \n  " color=yellow style=filled]
+	 "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_1" -> "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_3" ;
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_2" [label="2: Exit X::X \n  " color=yellow style=filled]
 	
 
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:X* [line 16, column 22]\n  n$1=*&a:int [line 16, column 26]\n  n$2=*&b:int [line 16, column 30]\n  *n$0.f:int=(n$1 + n$2) [line 16, column 22]\n " shape="box"]
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:X* [line 16, column 22]\n  n$1=*&a:int [line 16, column 26]\n  n$2=*&b:int [line 16, column 30]\n  *n$0.f:int=(n$1 + n$2) [line 16, column 22]\n " shape="box"]
 	
 
-	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_2" ;
+	 "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_3" -> "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_init.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_init.cpp.dot
index a745c2be1..79418c25e 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_init.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_init.cpp.dot
@@ -134,84 +134,84 @@ digraph cfg {
 	
 
 	 "t_div0#3531430030893775324.a762c245df414e083e61674c93898055_5" -> "t_div0#3531430030893775324.a762c245df414e083e61674c93898055_3" ;
-"A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_1" [label="1: Start A::A\nFormals:  this:A* f:int\nLocals:  \n  " color=yellow style=filled]
+"A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_1" [label="1: Start A::A\nFormals:  this:A* f:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_1" -> "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_3" ;
-"A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_2" [label="2: Exit A::A \n  " color=yellow style=filled]
+	 "A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_1" -> "A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_3" ;
+"A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_2" [label="2: Exit A::A \n  " color=yellow style=filled]
 	
 
-"A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_3" [label="3:  Constructor Init \n   n$1=*&this:A* [line 10, column 14]\n " shape="box"]
+"A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_3" [label="3:  Constructor Init \n   n$1=*&this:A* [line 10, column 14]\n " shape="box"]
 	
 
-	 "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_3" -> "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_4" ;
-"A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_4" [label="4:  Constructor Init \n   n$2=*&f:int [line 10, column 16]\n  *n$1.f:int=n$2 [line 10, column 14]\n " shape="box"]
+	 "A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_3" -> "A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_4" ;
+"A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_4" [label="4:  Constructor Init \n   n$2=*&f:int [line 10, column 16]\n  *n$1.f:int=n$2 [line 10, column 14]\n " shape="box"]
 	
 
-	 "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_4" -> "A#A#{14779048587651412014}.4ba2c6594c8960564bedc7b6cbdf6ae0_2" ;
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_1" [label="1: Start B::B\nFormals:  this:B* a:int\nLocals:  \n  " color=yellow style=filled]
+	 "A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_4" -> "A#A#{16649826940628685907}.507d1e638fd0cc290e038ea74a3900a8_2" ;
+"B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_1" [label="1: Start B::B\nFormals:  this:B* a:int b:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_1" -> "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_7" ;
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_2" [label="2: Exit B::B \n  " color=yellow style=filled]
+	 "B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_1" -> "B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_4" ;
+"B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_2" [label="2: Exit B::B \n  " color=yellow style=filled]
 	
 
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 20, column 27]\n " shape="box"]
+"B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:B* [line 22, column 32]\n  n$1=*&b:int [line 22, column 37]\n  *n$0.f2:int=n$1 [line 22, column 32]\n " shape="box"]
 	
 
-	 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_3" -> "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_4" ;
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_4" [label="4:  Constructor Init \n   n$2=*&a:int [line 20, column 29]\n  n$3=_fun_B::T::T(n$1.t:B::T*,n$2:int) [line 20, column 27]\n " shape="box"]
+	 "B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_3" -> "B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_2" ;
+"B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_4" [label="4:  Constructor Init \n   n$2=*&this:B* [line 22, column 21]\n " shape="box"]
 	
 
-	 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_4" -> "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_2" ;
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_5" [label="5:  Constructor Init \n   n$4=*&this:B* [line 20, column 20]\n " shape="box"]
+	 "B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_4" -> "B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_5" ;
+"B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_5" [label="5:  Constructor Init \n   n$3=*&a:int [line 22, column 23]\n  n$4=*&b:int [line 22, column 27]\n  n$5=_fun_B::B(n$2:B*,(n$3 + n$4):int) [line 22, column 21]\n " shape="box"]
 	
 
-	 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_5" -> "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_6" ;
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_6" [label="6:  Constructor Init \n   n$5=*&a:int [line 20, column 23]\n  *n$4.f2:int=n$5 [line 20, column 20]\n " shape="box"]
+	 "B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_5" -> "B#B#{15830384730391463473}.fd43b18ba9d4b8a7e4b3da4b0c6fecb9_3" ;
+"B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_1" [label="1: Start B::B\nFormals:  this:B* a:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_6" -> "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_3" ;
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_7" [label="7:  Constructor Init \n   n$6=*&this:B* [line 20, column 14]\n " shape="box"]
+	 "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_1" -> "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_7" ;
+"B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_2" [label="2: Exit B::B \n  " color=yellow style=filled]
 	
 
-	 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_7" -> "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_8" ;
-"B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_8" [label="8:  Constructor Init \n   n$7=*&a:int [line 20, column 16]\n  n$8=_fun_A::A(n$6:B*,n$7:int) [line 20, column 14]\n " shape="box"]
+"B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_3" [label="3:  Constructor Init \n   n$1=*&this:B* [line 20, column 27]\n " shape="box"]
 	
 
-	 "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_8" -> "B#B#{10798906211412859239}.a51813e44ba191ffaf76fde9e0b33185_5" ;
-"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_1" [label="1: Start B::B\nFormals:  this:B* a:int b:int\nLocals:  \n  " color=yellow style=filled]
+	 "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_3" -> "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_4" ;
+"B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_4" [label="4:  Constructor Init \n   n$2=*&a:int [line 20, column 29]\n  n$3=_fun_B::T::T(n$1.t:B::T*,n$2:int) [line 20, column 27]\n " shape="box"]
 	
 
-	 "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_1" -> "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_4" ;
-"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_2" [label="2: Exit B::B \n  " color=yellow style=filled]
+	 "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_4" -> "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_2" ;
+"B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_5" [label="5:  Constructor Init \n   n$4=*&this:B* [line 20, column 20]\n " shape="box"]
 	
 
-"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:B* [line 22, column 32]\n  n$1=*&b:int [line 22, column 37]\n  *n$0.f2:int=n$1 [line 22, column 32]\n " shape="box"]
+	 "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_5" -> "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_6" ;
+"B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_6" [label="6:  Constructor Init \n   n$5=*&a:int [line 20, column 23]\n  *n$4.f2:int=n$5 [line 20, column 20]\n " shape="box"]
 	
 
-	 "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_3" -> "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_2" ;
-"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_4" [label="4:  Constructor Init \n   n$2=*&this:B* [line 22, column 21]\n " shape="box"]
+	 "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_6" -> "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_3" ;
+"B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_7" [label="7:  Constructor Init \n   n$6=*&this:B* [line 20, column 14]\n " shape="box"]
 	
 
-	 "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_4" -> "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_5" ;
-"B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_5" [label="5:  Constructor Init \n   n$3=*&a:int [line 22, column 23]\n  n$4=*&b:int [line 22, column 27]\n  n$5=_fun_B::B(n$2:B*,(n$3 + n$4):int) [line 22, column 21]\n " shape="box"]
+	 "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_7" -> "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_8" ;
+"B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_8" [label="8:  Constructor Init \n   n$7=*&a:int [line 20, column 16]\n  n$8=_fun_A::A(n$6:B*,n$7:int) [line 20, column 14]\n " shape="box"]
 	
 
-	 "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_5" -> "B#B#{12472590675666260682}.da2bf46e3a176d218006b99f6059cb97_3" ;
-"T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_1" [label="1: Start B::T::T\nFormals:  this:B::T* v:int\nLocals:  \n  " color=yellow style=filled]
+	 "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_8" -> "B#B#{8928092674063482594}.5d96c403e1efea4d5713d1f6d54096df_5" ;
+"T#T#B#{12530982277420681367}.41e93b380ebb7b17b7ee55f46e4d8f95_1" [label="1: Start B::T::T\nFormals:  this:B::T* v:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_1" -> "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_3" ;
-"T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_2" [label="2: Exit B::T::T \n  " color=yellow style=filled]
+	 "T#T#B#{12530982277420681367}.41e93b380ebb7b17b7ee55f46e4d8f95_1" -> "T#T#B#{12530982277420681367}.41e93b380ebb7b17b7ee55f46e4d8f95_3" ;
+"T#T#B#{12530982277420681367}.41e93b380ebb7b17b7ee55f46e4d8f95_2" [label="2: Exit B::T::T \n  " color=yellow style=filled]
 	
 
-"T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_3" [label="3:  Constructor Init \n   n$1=*&this:B::T* [line 16, column 16]\n " shape="box"]
+"T#T#B#{12530982277420681367}.41e93b380ebb7b17b7ee55f46e4d8f95_3" [label="3:  Constructor Init \n   n$1=*&this:B::T* [line 16, column 16]\n " shape="box"]
 	
 
-	 "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_3" -> "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_4" ;
-"T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_4" [label="4:  Constructor Init \n   n$2=*&v:int [line 16, column 18]\n  *n$1.v:int=n$2 [line 16, column 16]\n " shape="box"]
+	 "T#T#B#{12530982277420681367}.41e93b380ebb7b17b7ee55f46e4d8f95_3" -> "T#T#B#{12530982277420681367}.41e93b380ebb7b17b7ee55f46e4d8f95_4" ;
+"T#T#B#{12530982277420681367}.41e93b380ebb7b17b7ee55f46e4d8f95_4" [label="4:  Constructor Init \n   n$2=*&v:int [line 16, column 18]\n  *n$1.v:int=n$2 [line 16, column 16]\n " shape="box"]
 	
 
-	 "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_4" -> "T#T#B#{10782891829941482898}.2f080fd8e7f17199a0e7ff14c49d6dba_2" ;
+	 "T#T#B#{12530982277420681367}.41e93b380ebb7b17b7ee55f46e4d8f95_4" -> "T#T#B#{12530982277420681367}.41e93b380ebb7b17b7ee55f46e4d8f95_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_new.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_new.cpp.dot
index 15dbbddb8..75db1f635 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_new.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_new.cpp.dot
@@ -541,45 +541,45 @@ digraph cfg {
 	
 
 	 "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_8" -> "matrix_of_person#constructor_new#930045482638918044.730172056e08027af32de0bd9a490291_3" ;
-"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_1" [label="1: Start constructor_new::Person::Person\nFormals:  this:constructor_new::Person* i:int j:int k:int\nLocals:  \n  " color=yellow style=filled]
+"Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_1" [label="1: Start constructor_new::Person::Person\nFormals:  this:constructor_new::Person* i:int j:int k:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_1" -> "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_5" ;
-"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_2" [label="2: Exit constructor_new::Person::Person \n  " color=yellow style=filled]
+	 "Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_1" -> "Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_5" ;
+"Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_2" [label="2: Exit constructor_new::Person::Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 18, column 5]\n  n$1=*&k:int [line 18, column 9]\n  *n$0.z:int=n$1 [line 18, column 5]\n " shape="box"]
+"Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 18, column 5]\n  n$1=*&k:int [line 18, column 9]\n  *n$0.z:int=n$1 [line 18, column 5]\n " shape="box"]
 	
 
-	 "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_3" -> "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_2" ;
-"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:constructor_new::Person* [line 17, column 5]\n  n$3=*&j:int [line 17, column 9]\n  *n$2.y:int=n$3 [line 17, column 5]\n " shape="box"]
+	 "Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_3" -> "Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_2" ;
+"Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:constructor_new::Person* [line 17, column 5]\n  n$3=*&j:int [line 17, column 9]\n  *n$2.y:int=n$3 [line 17, column 5]\n " shape="box"]
 	
 
-	 "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_4" -> "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_3" ;
-"Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&this:constructor_new::Person* [line 16, column 5]\n  n$5=*&i:int [line 16, column 9]\n  *n$4.x:int=n$5 [line 16, column 5]\n " shape="box"]
+	 "Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_4" -> "Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_3" ;
+"Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_5" [label="5:  BinaryOperatorStmt: Assign \n   n$4=*&this:constructor_new::Person* [line 16, column 5]\n  n$5=*&i:int [line 16, column 9]\n  *n$4.x:int=n$5 [line 16, column 5]\n " shape="box"]
 	
 
-	 "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_5" -> "Person#Person#constructor_new#{426040185711945372}.912ffb8f00635c43cd7277cb4f7bd8a3_4" ;
-"Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_1" [label="1: Start constructor_new::Person::Person\nFormals:  this:constructor_new::Person* i:int\nLocals:  \n  " color=yellow style=filled]
+	 "Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_5" -> "Person#Person#constructor_new#{6723793672544325533}.6147adcf714c9bad3c5abfabccc0e67e_4" ;
+"Person#Person#constructor_new#{7887049933001825163}.d38986ffbd7de27b7e51c99467ea082d_1" [label="1: Start constructor_new::Person::Person\nFormals:  this:constructor_new::Person* i:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_1" -> "Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_3" ;
-"Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_2" [label="2: Exit constructor_new::Person::Person \n  " color=yellow style=filled]
+	 "Person#Person#constructor_new#{7887049933001825163}.d38986ffbd7de27b7e51c99467ea082d_1" -> "Person#Person#constructor_new#{7887049933001825163}.d38986ffbd7de27b7e51c99467ea082d_3" ;
+"Person#Person#constructor_new#{7887049933001825163}.d38986ffbd7de27b7e51c99467ea082d_2" [label="2: Exit constructor_new::Person::Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 13, column 19]\n  n$1=*&i:int [line 13, column 23]\n  *n$0.x:int=n$1 [line 13, column 19]\n " shape="box"]
+"Person#Person#constructor_new#{7887049933001825163}.d38986ffbd7de27b7e51c99467ea082d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 13, column 19]\n  n$1=*&i:int [line 13, column 23]\n  *n$0.x:int=n$1 [line 13, column 19]\n " shape="box"]
 	
 
-	 "Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_3" -> "Person#Person#constructor_new#{6016517870629270534}.75bb70b834543e18977cd4fa8f8022a7_2" ;
-"Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_1" [label="1: Start constructor_new::Person::Person\nFormals:  this:constructor_new::Person*\nLocals:  \n  " color=yellow style=filled]
+	 "Person#Person#constructor_new#{7887049933001825163}.d38986ffbd7de27b7e51c99467ea082d_3" -> "Person#Person#constructor_new#{7887049933001825163}.d38986ffbd7de27b7e51c99467ea082d_2" ;
+"Person#Person#constructor_new#{7887064226652991906}.3f88819a6ff1b8c5ea11715dbef2cad1_1" [label="1: Start constructor_new::Person::Person\nFormals:  this:constructor_new::Person*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_1" -> "Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_3" ;
-"Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_2" [label="2: Exit constructor_new::Person::Person \n  " color=yellow style=filled]
+	 "Person#Person#constructor_new#{7887064226652991906}.3f88819a6ff1b8c5ea11715dbef2cad1_1" -> "Person#Person#constructor_new#{7887064226652991906}.3f88819a6ff1b8c5ea11715dbef2cad1_3" ;
+"Person#Person#constructor_new#{7887064226652991906}.3f88819a6ff1b8c5ea11715dbef2cad1_2" [label="2: Exit constructor_new::Person::Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 12, column 14]\n  *n$0.x:int=0 [line 12, column 14]\n " shape="box"]
+"Person#Person#constructor_new#{7887064226652991906}.3f88819a6ff1b8c5ea11715dbef2cad1_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_new::Person* [line 12, column 14]\n  *n$0.x:int=0 [line 12, column 14]\n " shape="box"]
 	
 
-	 "Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_3" -> "Person#Person#constructor_new#{6016547557443232231}.129098d47d79a7d06a2d6927fa32f467_2" ;
+	 "Person#Person#constructor_new#{7887064226652991906}.3f88819a6ff1b8c5ea11715dbef2cad1_3" -> "Person#Person#constructor_new#{7887064226652991906}.3f88819a6ff1b8c5ea11715dbef2cad1_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_struct_init_list.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_struct_init_list.cpp.dot
index 1e08c4e4b..cf35c6245 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_struct_init_list.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_struct_init_list.cpp.dot
@@ -11,19 +11,19 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_1" [label="1: Start Person::Person\nFormals:  this:Person* l:Insets const &\nLocals:  \n  " color=yellow style=filled]
+"Person#Person#{4567572656966344273}.24cb9b5010777331f19cf9e42813243f_1" [label="1: Start Person::Person\nFormals:  this:Person* l:Insets const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_1" -> "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_3" ;
-"Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_2" [label="2: Exit Person::Person \n  " color=yellow style=filled]
+	 "Person#Person#{4567572656966344273}.24cb9b5010777331f19cf9e42813243f_1" -> "Person#Person#{4567572656966344273}.24cb9b5010777331f19cf9e42813243f_3" ;
+"Person#Person#{4567572656966344273}.24cb9b5010777331f19cf9e42813243f_2" [label="2: Exit Person::Person \n  " color=yellow style=filled]
 	
 
-"Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_3" [label="3:  Constructor Init \n   n$1=*&this:Person* [line 14, column 28]\n " shape="box"]
+"Person#Person#{4567572656966344273}.24cb9b5010777331f19cf9e42813243f_3" [label="3:  Constructor Init \n   n$1=*&this:Person* [line 14, column 28]\n " shape="box"]
 	
 
-	 "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_3" -> "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_4" ;
-"Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_4" [label="4:  Constructor Init \n   n$2=*&l:Insets const & [line 14, column 32]\n  n$3=*n$2.top:int [line 14, column 32]\n  *n$1.age:int=n$3 [line 14, column 28]\n " shape="box"]
+	 "Person#Person#{4567572656966344273}.24cb9b5010777331f19cf9e42813243f_3" -> "Person#Person#{4567572656966344273}.24cb9b5010777331f19cf9e42813243f_4" ;
+"Person#Person#{4567572656966344273}.24cb9b5010777331f19cf9e42813243f_4" [label="4:  Constructor Init \n   n$2=*&l:Insets const & [line 14, column 32]\n  n$3=*n$2.top:int [line 14, column 32]\n  *n$1.age:int=n$3 [line 14, column 28]\n " shape="box"]
 	
 
-	 "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_4" -> "Person#Person#{5857402560744521252}.6ef0efc697f825c2030746b71de7fd56_2" ;
+	 "Person#Person#{4567572656966344273}.24cb9b5010777331f19cf9e42813243f_4" -> "Person#Person#{4567572656966344273}.24cb9b5010777331f19cf9e42813243f_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_with_body.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_with_body.cpp.dot
index cbae968ab..f8312f6d5 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_with_body.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/constructor_with_body.cpp.dot
@@ -71,34 +71,34 @@ digraph cfg {
 	
 
 	 "div#X#constructor_with_body#(13588730973960944321).0be58d73703c72cf5bf8f7e2a36ecf60_4" -> "div#X#constructor_with_body#(13588730973960944321).0be58d73703c72cf5bf8f7e2a36ecf60_2" ;
-"X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_1" [label="1: Start constructor_with_body::X::X\nFormals:  this:constructor_with_body::X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_1" [label="1: Start constructor_with_body::X::X\nFormals:  this:constructor_with_body::X* a:int b:int\nLocals:  c:int \n  " color=yellow style=filled]
 	
 
-	 "X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_1" -> "X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_3" ;
-"X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_2" [label="2: Exit constructor_with_body::X::X \n  " color=yellow style=filled]
+	 "X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_1" -> "X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_5" ;
+"X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_2" [label="2: Exit constructor_with_body::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_3" [label="3:  Call _fun_constructor_with_body::X::init \n   n$0=*&this:constructor_with_body::X* [line 15, column 9]\n  _=*n$0:constructor_with_body::X [line 15, column 9]\n  n$2=_fun_constructor_with_body::X::init(n$0:constructor_with_body::X*) [line 15, column 9]\n " shape="box"]
+"X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_with_body::X* [line 25, column 3]\n  n$1=*&c:int [line 25, column 7]\n  *n$0.f:int=n$1 [line 25, column 3]\n " shape="box"]
 	
 
-	 "X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_3" -> "X#X#constructor_with_body#{16871729092574880817}.54f479ca84639d148c4b988a7530253a_2" ;
-"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_1" [label="1: Start constructor_with_body::X::X\nFormals:  this:constructor_with_body::X* a:int b:int\nLocals:  c:int \n  " color=yellow style=filled]
+	 "X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_3" -> "X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_2" ;
+"X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_4" [label="4:  Call _fun_constructor_with_body::X::init \n   n$2=*&this:constructor_with_body::X* [line 24, column 3]\n  _=*n$2:constructor_with_body::X [line 24, column 3]\n  n$4=_fun_constructor_with_body::X::init(n$2:constructor_with_body::X*) [line 24, column 3]\n " shape="box"]
 	
 
-	 "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_1" -> "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_5" ;
-"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_2" [label="2: Exit constructor_with_body::X::X \n  " color=yellow style=filled]
+	 "X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_4" -> "X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_3" ;
+"X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 23, column 3]\n  n$5=*&a:int [line 23, column 11]\n  n$6=*&b:int [line 23, column 15]\n  *&c:int=(n$5 + n$6) [line 23, column 3]\n " shape="box"]
 	
 
-"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:constructor_with_body::X* [line 25, column 3]\n  n$1=*&c:int [line 25, column 7]\n  *n$0.f:int=n$1 [line 25, column 3]\n " shape="box"]
+	 "X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_5" -> "X#X#constructor_with_body#{14402990374035126508}.c2bb8c6ae9afcc4ebff5dfa250fdc017_4" ;
+"X#X#constructor_with_body#{16360505663622332512}.217074c825cdb71909668a653150e1b8_1" [label="1: Start constructor_with_body::X::X\nFormals:  this:constructor_with_body::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_3" -> "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_2" ;
-"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_4" [label="4:  Call _fun_constructor_with_body::X::init \n   n$2=*&this:constructor_with_body::X* [line 24, column 3]\n  _=*n$2:constructor_with_body::X [line 24, column 3]\n  n$4=_fun_constructor_with_body::X::init(n$2:constructor_with_body::X*) [line 24, column 3]\n " shape="box"]
+	 "X#X#constructor_with_body#{16360505663622332512}.217074c825cdb71909668a653150e1b8_1" -> "X#X#constructor_with_body#{16360505663622332512}.217074c825cdb71909668a653150e1b8_3" ;
+"X#X#constructor_with_body#{16360505663622332512}.217074c825cdb71909668a653150e1b8_2" [label="2: Exit constructor_with_body::X::X \n  " color=yellow style=filled]
 	
 
-	 "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_4" -> "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_3" ;
-"X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_5" [label="5:  DeclStmt \n   VARIABLE_DECLARED(c:int); [line 23, column 3]\n  n$5=*&a:int [line 23, column 11]\n  n$6=*&b:int [line 23, column 15]\n  *&c:int=(n$5 + n$6) [line 23, column 3]\n " shape="box"]
+"X#X#constructor_with_body#{16360505663622332512}.217074c825cdb71909668a653150e1b8_3" [label="3:  Call _fun_constructor_with_body::X::init \n   n$0=*&this:constructor_with_body::X* [line 15, column 9]\n  _=*n$0:constructor_with_body::X [line 15, column 9]\n  n$2=_fun_constructor_with_body::X::init(n$0:constructor_with_body::X*) [line 15, column 9]\n " shape="box"]
 	
 
-	 "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_5" -> "X#X#constructor_with_body#{7540788797581315247}.c8826e9323020557160f8002c0b802f2_4" ;
+	 "X#X#constructor_with_body#{16360505663622332512}.217074c825cdb71909668a653150e1b8_3" -> "X#X#constructor_with_body#{16360505663622332512}.217074c825cdb71909668a653150e1b8_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/copy_array_field.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/copy_array_field.cpp.dot
index 84c95fa8a..701105fc7 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/copy_array_field.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/copy_array_field.cpp.dot
@@ -58,34 +58,34 @@ digraph cfg {
 	
 
 	 "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_7" -> "npe#copy_array_field#77301322902488828.946ed5a43ad43585633fa030996f9ad5_6" ;
-"X#X#copy_array_field#{13837822965298396151}.45edc461c1975571aa48e5a08cc73f08_1" [label="1: Start copy_array_field::X::X\nFormals:  this:copy_array_field::X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#copy_array_field#{15830781249401511986}.21901b5566a8885e763a29ee298681a2_1" [label="1: Start copy_array_field::X::X\nFormals:  this:copy_array_field::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#copy_array_field#{13837822965298396151}.45edc461c1975571aa48e5a08cc73f08_1" -> "X#X#copy_array_field#{13837822965298396151}.45edc461c1975571aa48e5a08cc73f08_2" ;
-"X#X#copy_array_field#{13837822965298396151}.45edc461c1975571aa48e5a08cc73f08_2" [label="2: Exit copy_array_field::X::X \n  " color=yellow style=filled]
+	 "X#X#copy_array_field#{15830781249401511986}.21901b5566a8885e763a29ee298681a2_1" -> "X#X#copy_array_field#{15830781249401511986}.21901b5566a8885e763a29ee298681a2_2" ;
+"X#X#copy_array_field#{15830781249401511986}.21901b5566a8885e763a29ee298681a2_2" [label="2: Exit copy_array_field::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_1" [label="1: Start copy_array_field::X::X\nFormals:  this:copy_array_field::X* __param_0:copy_array_field::X const &\nLocals:  \n  " color=yellow style=filled]
+"X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_1" [label="1: Start copy_array_field::X::X\nFormals:  this:copy_array_field::X* __param_0:copy_array_field::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_1" -> "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_5" ;
-"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_2" [label="2: Exit copy_array_field::X::X \n  " color=yellow style=filled]
+	 "X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_1" -> "X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_5" ;
+"X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_2" [label="2: Exit copy_array_field::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_3" [label="3:  Constructor Init \n   n$1=*&this:copy_array_field::X* [line 8, column 8]\n " shape="box"]
+"X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_3" [label="3:  Constructor Init \n   n$1=*&this:copy_array_field::X* [line 8, column 8]\n " shape="box"]
 	
 
-	 "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_3" -> "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_4" ;
-"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_4" [label="4:  Constructor Init \n   *n$1.x:void=n$2 [line 8, column 8]\n " shape="box"]
+	 "X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_3" -> "X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_4" ;
+"X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_4" [label="4:  Constructor Init \n   *n$1.x:void=n$2 [line 8, column 8]\n " shape="box"]
 	
 
-	 "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_4" -> "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_2" ;
-"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_5" [label="5:  Constructor Init \n   n$3=*&this:copy_array_field::X* [line 8, column 8]\n " shape="box"]
+	 "X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_4" -> "X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_2" ;
+"X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_5" [label="5:  Constructor Init \n   n$3=*&this:copy_array_field::X* [line 8, column 8]\n " shape="box"]
 	
 
-	 "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_5" -> "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_6" ;
-"X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_6" [label="6:  Constructor Init \n   n$4=*&__param_0:copy_array_field::X const & [line 8, column 8]\n  n$5=*n$4.p:int* [line 8, column 8]\n  *n$3.p:int*=n$5 [line 8, column 8]\n " shape="box"]
+	 "X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_5" -> "X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_6" ;
+"X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_6" [label="6:  Constructor Init \n   n$4=*&__param_0:copy_array_field::X const & [line 8, column 8]\n  n$5=*n$4.p:int* [line 8, column 8]\n  *n$3.p:int*=n$5 [line 8, column 8]\n " shape="box"]
 	
 
-	 "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_6" -> "X#X#copy_array_field#{17703731918757231564|constexpr}.ab45982a069b7b3a582b1d4796205cce_3" ;
+	 "X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_6" -> "X#X#copy_array_field#{63190381010172561|constexpr}.d82e53d0368148a9de74f3c68bf6427f_3" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/copy_move_constructor.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/copy_move_constructor.cpp.dot
index 313958e4d..cb4d83e5c 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/copy_move_constructor.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/copy_move_constructor.cpp.dot
@@ -271,78 +271,78 @@ digraph cfg {
 	
 
 	 "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_8" -> "moveY_moveY_copyY_div0#copy_move_constructor#11319351724516006746.d5d5d96d98dcf1c634b647be30001d2e_6" ;
-"X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_1" [label="1: Start copy_move_constructor::X::X\nFormals:  this:copy_move_constructor::X* __param_0:copy_move_constructor::X&\nLocals:  \n  " color=yellow style=filled]
+"X#X#copy_move_constructor#{11779436833146999139|constexpr}.6785ea50e80ccaf1e56252f5a181f7d3_1" [label="1: Start copy_move_constructor::X::X\nFormals:  this:copy_move_constructor::X* __param_0:copy_move_constructor::X&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_1" -> "X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_3" ;
-"X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_2" [label="2: Exit copy_move_constructor::X::X \n  " color=yellow style=filled]
+	 "X#X#copy_move_constructor#{11779436833146999139|constexpr}.6785ea50e80ccaf1e56252f5a181f7d3_1" -> "X#X#copy_move_constructor#{11779436833146999139|constexpr}.6785ea50e80ccaf1e56252f5a181f7d3_3" ;
+"X#X#copy_move_constructor#{11779436833146999139|constexpr}.6785ea50e80ccaf1e56252f5a181f7d3_2" [label="2: Exit copy_move_constructor::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::X* [line 13, column 8]\n " shape="box"]
+"X#X#copy_move_constructor#{11779436833146999139|constexpr}.6785ea50e80ccaf1e56252f5a181f7d3_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::X* [line 13, column 8]\n " shape="box"]
 	
 
-	 "X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_3" -> "X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_4" ;
-"X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_4" [label="4:  Constructor Init \n   n$2=*&__param_0:copy_move_constructor::X& [line 13, column 8]\n  n$3=*n$2.f:int [line 13, column 8]\n  *n$1.f:int=n$3 [line 13, column 8]\n " shape="box"]
+	 "X#X#copy_move_constructor#{11779436833146999139|constexpr}.6785ea50e80ccaf1e56252f5a181f7d3_3" -> "X#X#copy_move_constructor#{11779436833146999139|constexpr}.6785ea50e80ccaf1e56252f5a181f7d3_4" ;
+"X#X#copy_move_constructor#{11779436833146999139|constexpr}.6785ea50e80ccaf1e56252f5a181f7d3_4" [label="4:  Constructor Init \n   n$2=*&__param_0:copy_move_constructor::X& [line 13, column 8]\n  n$3=*n$2.f:int [line 13, column 8]\n  *n$1.f:int=n$3 [line 13, column 8]\n " shape="box"]
 	
 
-	 "X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_4" -> "X#X#copy_move_constructor#{10174102600918728520|constexpr}.7f1f4443383b6eabdf400de956c7f6af_2" ;
-"X#X#copy_move_constructor#{10968604964233077287}.2f7f6ea6443bd7f6e81f1eae0ad96ec1_1" [label="1: Start copy_move_constructor::X::X\nFormals:  this:copy_move_constructor::X*\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#copy_move_constructor#{11779436833146999139|constexpr}.6785ea50e80ccaf1e56252f5a181f7d3_4" -> "X#X#copy_move_constructor#{11779436833146999139|constexpr}.6785ea50e80ccaf1e56252f5a181f7d3_2" ;
+"X#X#copy_move_constructor#{12839121633442836962}.1116c82b0711f545c843920f0e2f3f85_1" [label="1: Start copy_move_constructor::X::X\nFormals:  this:copy_move_constructor::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#copy_move_constructor#{10968604964233077287}.2f7f6ea6443bd7f6e81f1eae0ad96ec1_1" -> "X#X#copy_move_constructor#{10968604964233077287}.2f7f6ea6443bd7f6e81f1eae0ad96ec1_2" ;
-"X#X#copy_move_constructor#{10968604964233077287}.2f7f6ea6443bd7f6e81f1eae0ad96ec1_2" [label="2: Exit copy_move_constructor::X::X \n  " color=yellow style=filled]
+	 "X#X#copy_move_constructor#{12839121633442836962}.1116c82b0711f545c843920f0e2f3f85_1" -> "X#X#copy_move_constructor#{12839121633442836962}.1116c82b0711f545c843920f0e2f3f85_2" ;
+"X#X#copy_move_constructor#{12839121633442836962}.1116c82b0711f545c843920f0e2f3f85_2" [label="2: Exit copy_move_constructor::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_1" [label="1: Start copy_move_constructor::X::X\nFormals:  this:copy_move_constructor::X* __param_0:copy_move_constructor::X const &\nLocals:  \n  " color=yellow style=filled]
+"X#X#copy_move_constructor#{9902755543253181921|constexpr}.e1eff228bed6df3ef237e29c8ec8f122_1" [label="1: Start copy_move_constructor::X::X\nFormals:  this:copy_move_constructor::X* __param_0:copy_move_constructor::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_1" -> "X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_3" ;
-"X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_2" [label="2: Exit copy_move_constructor::X::X \n  " color=yellow style=filled]
+	 "X#X#copy_move_constructor#{9902755543253181921|constexpr}.e1eff228bed6df3ef237e29c8ec8f122_1" -> "X#X#copy_move_constructor#{9902755543253181921|constexpr}.e1eff228bed6df3ef237e29c8ec8f122_3" ;
+"X#X#copy_move_constructor#{9902755543253181921|constexpr}.e1eff228bed6df3ef237e29c8ec8f122_2" [label="2: Exit copy_move_constructor::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::X* [line 13, column 8]\n " shape="box"]
+"X#X#copy_move_constructor#{9902755543253181921|constexpr}.e1eff228bed6df3ef237e29c8ec8f122_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::X* [line 13, column 8]\n " shape="box"]
 	
 
-	 "X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_3" -> "X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_4" ;
-"X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_4" [label="4:  Constructor Init \n   n$2=*&__param_0:copy_move_constructor::X const & [line 13, column 8]\n  n$3=*n$2.f:int [line 13, column 8]\n  *n$1.f:int=n$3 [line 13, column 8]\n " shape="box"]
+	 "X#X#copy_move_constructor#{9902755543253181921|constexpr}.e1eff228bed6df3ef237e29c8ec8f122_3" -> "X#X#copy_move_constructor#{9902755543253181921|constexpr}.e1eff228bed6df3ef237e29c8ec8f122_4" ;
+"X#X#copy_move_constructor#{9902755543253181921|constexpr}.e1eff228bed6df3ef237e29c8ec8f122_4" [label="4:  Constructor Init \n   n$2=*&__param_0:copy_move_constructor::X const & [line 13, column 8]\n  n$3=*n$2.f:int [line 13, column 8]\n  *n$1.f:int=n$3 [line 13, column 8]\n " shape="box"]
 	
 
-	 "X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_4" -> "X#X#copy_move_constructor#{11461885598838954204|constexpr}.8b245330f9990df6f1e3d0622b3e7433_2" ;
-"Y#Y#copy_move_constructor#{1021306560387426992}.841cfe557ed8d8dec57a221bbce98e74_1" [label="1: Start copy_move_constructor::Y::Y\nFormals:  this:copy_move_constructor::Y*\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#copy_move_constructor#{9902755543253181921|constexpr}.e1eff228bed6df3ef237e29c8ec8f122_4" -> "X#X#copy_move_constructor#{9902755543253181921|constexpr}.e1eff228bed6df3ef237e29c8ec8f122_2" ;
+"Y#Y#copy_move_constructor#{13891707530704658482|constexpr}.b879e346ca1d8078c3a8bb7242d0773e_1" [label="1: Start copy_move_constructor::Y::Y\nFormals:  this:copy_move_constructor::Y* y:copy_move_constructor::Y const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#copy_move_constructor#{1021306560387426992}.841cfe557ed8d8dec57a221bbce98e74_1" -> "Y#Y#copy_move_constructor#{1021306560387426992}.841cfe557ed8d8dec57a221bbce98e74_2" ;
-"Y#Y#copy_move_constructor#{1021306560387426992}.841cfe557ed8d8dec57a221bbce98e74_2" [label="2: Exit copy_move_constructor::Y::Y \n  " color=yellow style=filled]
+	 "Y#Y#copy_move_constructor#{13891707530704658482|constexpr}.b879e346ca1d8078c3a8bb7242d0773e_1" -> "Y#Y#copy_move_constructor#{13891707530704658482|constexpr}.b879e346ca1d8078c3a8bb7242d0773e_3" ;
+"Y#Y#copy_move_constructor#{13891707530704658482|constexpr}.b879e346ca1d8078c3a8bb7242d0773e_2" [label="2: Exit copy_move_constructor::Y::Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_1" [label="1: Start copy_move_constructor::Y::Y\nFormals:  this:copy_move_constructor::Y* y:copy_move_constructor::Y const &\nLocals:  \n  " color=yellow style=filled]
+"Y#Y#copy_move_constructor#{13891707530704658482|constexpr}.b879e346ca1d8078c3a8bb7242d0773e_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::Y* [line 22, column 3]\n " shape="box"]
 	
 
-	 "Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_1" -> "Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_3" ;
-"Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_2" [label="2: Exit copy_move_constructor::Y::Y \n  " color=yellow style=filled]
+	 "Y#Y#copy_move_constructor#{13891707530704658482|constexpr}.b879e346ca1d8078c3a8bb7242d0773e_3" -> "Y#Y#copy_move_constructor#{13891707530704658482|constexpr}.b879e346ca1d8078c3a8bb7242d0773e_4" ;
+"Y#Y#copy_move_constructor#{13891707530704658482|constexpr}.b879e346ca1d8078c3a8bb7242d0773e_4" [label="4:  Constructor Init \n   n$2=*&y:copy_move_constructor::Y const & [line 22, column 3]\n  n$3=*n$2.f:int [line 22, column 3]\n  *n$1.f:int=n$3 [line 22, column 3]\n " shape="box"]
 	
 
-"Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::Y* [line 24, column 20]\n " shape="box"]
+	 "Y#Y#copy_move_constructor#{13891707530704658482|constexpr}.b879e346ca1d8078c3a8bb7242d0773e_4" -> "Y#Y#copy_move_constructor#{13891707530704658482|constexpr}.b879e346ca1d8078c3a8bb7242d0773e_2" ;
+"Y#Y#copy_move_constructor#{1655253079210153473}.d07764a8af75926672fb5a32dd8dc7ea_1" [label="1: Start copy_move_constructor::Y::Y\nFormals:  this:copy_move_constructor::Y*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_3" -> "Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_4" ;
-"Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_4" [label="4:  Constructor Init \n   n$2=*&y:copy_move_constructor::Y const & [line 24, column 22]\n  n$3=*n$2.f:int [line 24, column 22]\n  *n$1.f:int=(n$3 - 1) [line 24, column 20]\n " shape="box"]
+	 "Y#Y#copy_move_constructor#{1655253079210153473}.d07764a8af75926672fb5a32dd8dc7ea_1" -> "Y#Y#copy_move_constructor#{1655253079210153473}.d07764a8af75926672fb5a32dd8dc7ea_2" ;
+"Y#Y#copy_move_constructor#{1655253079210153473}.d07764a8af75926672fb5a32dd8dc7ea_2" [label="2: Exit copy_move_constructor::Y::Y \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_4" -> "Y#Y#copy_move_constructor#{18272181401462210540}.6215678d929da0a4d67ea5f3b952308e_2" ;
-"Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_1" [label="1: Start copy_move_constructor::Y::Y\nFormals:  this:copy_move_constructor::Y* y:copy_move_constructor::Y const &\nLocals:  \n  " color=yellow style=filled]
+"Y#Y#copy_move_constructor#{18239234573116449841}.cef7f0339ba010d7b6444a5ef7ffec3c_1" [label="1: Start copy_move_constructor::Y::Y\nFormals:  this:copy_move_constructor::Y* y:copy_move_constructor::Y const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_1" -> "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_3" ;
-"Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_2" [label="2: Exit copy_move_constructor::Y::Y \n  " color=yellow style=filled]
+	 "Y#Y#copy_move_constructor#{18239234573116449841}.cef7f0339ba010d7b6444a5ef7ffec3c_1" -> "Y#Y#copy_move_constructor#{18239234573116449841}.cef7f0339ba010d7b6444a5ef7ffec3c_3" ;
+"Y#Y#copy_move_constructor#{18239234573116449841}.cef7f0339ba010d7b6444a5ef7ffec3c_2" [label="2: Exit copy_move_constructor::Y::Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::Y* [line 22, column 3]\n " shape="box"]
+"Y#Y#copy_move_constructor#{18239234573116449841}.cef7f0339ba010d7b6444a5ef7ffec3c_3" [label="3:  Constructor Init \n   n$1=*&this:copy_move_constructor::Y* [line 24, column 20]\n " shape="box"]
 	
 
-	 "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_3" -> "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_4" ;
-"Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_4" [label="4:  Constructor Init \n   n$2=*&y:copy_move_constructor::Y const & [line 22, column 3]\n  n$3=*n$2.f:int [line 22, column 3]\n  *n$1.f:int=n$3 [line 22, column 3]\n " shape="box"]
+	 "Y#Y#copy_move_constructor#{18239234573116449841}.cef7f0339ba010d7b6444a5ef7ffec3c_3" -> "Y#Y#copy_move_constructor#{18239234573116449841}.cef7f0339ba010d7b6444a5ef7ffec3c_4" ;
+"Y#Y#copy_move_constructor#{18239234573116449841}.cef7f0339ba010d7b6444a5ef7ffec3c_4" [label="4:  Constructor Init \n   n$2=*&y:copy_move_constructor::Y const & [line 24, column 22]\n  n$3=*n$2.f:int [line 24, column 22]\n  *n$1.f:int=(n$3 - 1) [line 24, column 20]\n " shape="box"]
 	
 
-	 "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_4" -> "Y#Y#copy_move_constructor#{2644368372854768795|constexpr}.992ebae8b36e68c2e1b5e338a4c29705_2" ;
+	 "Y#Y#copy_move_constructor#{18239234573116449841}.cef7f0339ba010d7b6444a5ef7ffec3c_4" -> "Y#Y#copy_move_constructor#{18239234573116449841}.cef7f0339ba010d7b6444a5ef7ffec3c_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/default_field_init.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/default_field_init.cpp.dot
index 9d13a95e8..db5427fa9 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/default_field_init.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/default_field_init.cpp.dot
@@ -11,97 +11,97 @@ digraph cfg {
 	
 
 	 "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_3" -> "test#18241244337164948030.afc14f193ad97442f67ac7183be789bc_2" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_1" [label="1: Start X::X\nFormals:  this:X* a:int b:int\nLocals:  \n  " color=yellow style=filled]
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_1" [label="1: Start X::X\nFormals:  this:X* a:int b:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_1" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_7" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_2" [label="2: Exit X::X \n  " color=yellow style=filled]
+	 "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_1" -> "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_7" ;
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_2" [label="2: Exit X::X \n  " color=yellow style=filled]
 	
 
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" [label="3:  Constructor Init \n   n$1=*&this:X* [line 11, column 8]\n " shape="box"]
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_3" [label="3:  Constructor Init \n   n$1=*&this:X* [line 11, column 8]\n " shape="box"]
 	
 
-	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_4" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_4" [label="4:  Constructor Init \n   *n$1.c:int=0 [line 11, column 8]\n " shape="box"]
+	 "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_3" -> "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_4" ;
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_4" [label="4:  Constructor Init \n   *n$1.c:int=0 [line 11, column 8]\n " shape="box"]
 	
 
-	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_4" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_2" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_5" [label="5:  Constructor Init \n   n$2=*&this:X* [line 10, column 8]\n " shape="box"]
+	 "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_4" -> "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_2" ;
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_5" [label="5:  Constructor Init \n   n$2=*&this:X* [line 10, column 8]\n " shape="box"]
 	
 
-	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_5" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_6" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_6" [label="6:  Constructor Init \n   *n$2.b:int=-2 [line 10, column 8]\n " shape="box"]
+	 "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_5" -> "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_6" ;
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_6" [label="6:  Constructor Init \n   *n$2.b:int=-2 [line 10, column 8]\n " shape="box"]
 	
 
-	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_6" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_3" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_7" [label="7:  Constructor Init \n   n$3=*&this:X* [line 14, column 21]\n " shape="box"]
+	 "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_6" -> "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_3" ;
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_7" [label="7:  Constructor Init \n   n$3=*&this:X* [line 14, column 21]\n " shape="box"]
 	
 
-	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_7" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_8" ;
-"X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_8" [label="8:  Constructor Init \n   n$4=*&a:int [line 14, column 23]\n  n$5=*&b:int [line 14, column 27]\n  *n$3.a:int=(n$4 + n$5) [line 14, column 21]\n " shape="box"]
+	 "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_7" -> "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_8" ;
+"X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_8" [label="8:  Constructor Init \n   n$4=*&a:int [line 14, column 23]\n  n$5=*&b:int [line 14, column 27]\n  *n$3.a:int=(n$4 + n$5) [line 14, column 21]\n " shape="box"]
 	
 
-	 "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_8" -> "X#X#{14939599560045044604}.b28c8e2a1dd7783932fc838d8413f387_5" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_1" [label="1: Start X::X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_8" -> "X#X#{14428669737419226111}.bcdced57ebd07811007dd9555b8e9fc0_5" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_1" [label="1: Start X::X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_1" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_7" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" [label="2: Exit X::X \n  " color=yellow style=filled]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_1" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_7" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_2" [label="2: Exit X::X \n  " color=yellow style=filled]
 	
 
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_3" [label="3:  Constructor Init \n   n$1=*&this:X* [line 11, column 8]\n " shape="box"]
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_3" [label="3:  Constructor Init \n   n$1=*&this:X* [line 11, column 8]\n " shape="box"]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_3" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_4" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_4" [label="4:  Constructor Init \n   *n$1.c:int=0 [line 11, column 8]\n " shape="box"]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_3" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_4" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_4" [label="4:  Constructor Init \n   *n$1.c:int=0 [line 11, column 8]\n " shape="box"]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_4" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_5" [label="5:  Constructor Init \n   n$2=*&this:X* [line 10, column 8]\n " shape="box"]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_4" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_2" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_5" [label="5:  Constructor Init \n   n$2=*&this:X* [line 10, column 8]\n " shape="box"]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_5" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_6" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_6" [label="6:  Constructor Init \n   *n$2.b:int=-2 [line 10, column 8]\n " shape="box"]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_5" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_6" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_6" [label="6:  Constructor Init \n   *n$2.b:int=-2 [line 10, column 8]\n " shape="box"]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_6" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_3" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_7" [label="7:  Constructor Init \n   n$3=*&this:X* [line 9, column 11]\n " shape="box"]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_6" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_3" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_7" [label="7:  Constructor Init \n   n$3=*&this:X* [line 9, column 11]\n " shape="box"]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_7" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_8" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_8" [label="8:  Constructor Init \n   *n$3.a:int=-1 [line 9, column 11]\n " shape="box"]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_7" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_8" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_8" [label="8:  Constructor Init \n   *n$3.a:int=-1 [line 9, column 11]\n " shape="box"]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_8" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_5" ;
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_1" [label="1: Start Y::Y\nFormals:  this:Y*\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_8" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_5" ;
+"Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_1" [label="1: Start Y::Y\nFormals:  this:Y*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_1" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_7" ;
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_2" [label="2: Exit Y::Y \n  " color=yellow style=filled]
+	 "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_1" -> "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_7" ;
+"Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_2" [label="2: Exit Y::Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_3" [label="3:  Constructor Init \n   n$1=*&this:Y* [line 17, column 8]\n " shape="box"]
+"Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_3" [label="3:  Constructor Init \n   n$1=*&this:Y* [line 17, column 8]\n " shape="box"]
 	
 
-	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_3" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_4" ;
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_4" [label="4:  Constructor Init \n   n$2=_fun_X::X(n$1.x3:X*) [line 17, column 8]\n " shape="box"]
+	 "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_3" -> "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_4" ;
+"Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_4" [label="4:  Constructor Init \n   n$2=_fun_X::X(n$1.x3:X*) [line 17, column 8]\n " shape="box"]
 	
 
-	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_4" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_2" ;
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_5" [label="5:  Constructor Init \n   n$3=*&this:Y* [line 19, column 7]\n " shape="box"]
+	 "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_4" -> "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_2" ;
+"Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_5" [label="5:  Constructor Init \n   n$3=*&this:Y* [line 19, column 7]\n " shape="box"]
 	
 
-	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_5" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_6" ;
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_6" [label="6:  Constructor Init \n   n$4=_fun_X::X(n$3.x2:X*) [line 19, column 7]\n " shape="box"]
+	 "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_5" -> "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_6" ;
+"Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_6" [label="6:  Constructor Init \n   n$4=_fun_X::X(n$3.x2:X*) [line 19, column 7]\n " shape="box"]
 	
 
-	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_6" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_3" ;
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_7" [label="7:  Constructor Init \n   n$5=*&this:Y* [line 18, column 7]\n " shape="box"]
+	 "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_6" -> "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_3" ;
+"Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_7" [label="7:  Constructor Init \n   n$5=*&this:Y* [line 18, column 7]\n " shape="box"]
 	
 
-	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_7" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_8" ;
-"Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_8" [label="8:  Constructor Init \n   n$6=_fun_X::X(n$5.x1:X*,1:int,2:int) [line 18, column 7]\n " shape="box"]
+	 "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_7" -> "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_8" ;
+"Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_8" [label="8:  Constructor Init \n   n$6=_fun_X::X(n$5.x1:X*,1:int,2:int) [line 18, column 7]\n " shape="box"]
 	
 
-	 "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_8" -> "Y#Y#{14898916407379161639}.007f922d3b4cc65335a37959ae6b89f8_5" ;
+	 "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_8" -> "Y#Y#{16769433076588921314}.5334d541bfbc1a715ad9b77390d973d9_5" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/std_init_list.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/std_init_list.cpp.dot
index 0b6513220..f104c45e0 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/std_init_list.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/std_init_list.cpp.dot
@@ -19,40 +19,40 @@ digraph cfg {
 	
 
 	 "main.fad58de7366495db4650cfefac2fcd61_5" -> "main.fad58de7366495db4650cfefac2fcd61_2" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_1" [label="1: Start X::X\nFormals:  this:X* list:std::initializer_list<int>&\nLocals:  i:int const * \n  " color=yellow style=filled]
+"X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_1" [label="1: Start X::X\nFormals:  this:X* list:std::initializer_list<int>&\nLocals:  i:int const * \n  " color=yellow style=filled]
 	
 
-	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_1" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_4" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_2" [label="2: Exit X::X \n  " color=yellow style=filled]
+	 "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_1" -> "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_4" ;
+"X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_2" [label="2: Exit X::X \n  " color=yellow style=filled]
 	
 
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_3" [label="3: + \n  " ]
+"X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_3" [label="3: + \n  " ]
 	
 
-	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_3" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(i:int const *); [line 13, column 10]\n  n$0=*&list:std::initializer_list<int>& [line 13, column 19]\n  _=*n$0:std::initializer_list<int> [line 13, column 19]\n  n$2=_fun_std::initializer_list<int>::begin(n$0:std::initializer_list<int>&) [line 13, column 19]\n  *&i:int const *=n$2 [line 13, column 10]\n " shape="box"]
+	 "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_3" -> "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_6" ;
+"X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_4" [label="4:  DeclStmt \n   VARIABLE_DECLARED(i:int const *); [line 13, column 10]\n  n$0=*&list:std::initializer_list<int>& [line 13, column 19]\n  _=*n$0:std::initializer_list<int> [line 13, column 19]\n  n$2=_fun_std::initializer_list<int>::begin(n$0:std::initializer_list<int>&) [line 13, column 19]\n  *&i:int const *=n$2 [line 13, column 10]\n " shape="box"]
 	
 
-	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_4" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_3" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_5" [label="5:  UnaryOperator \n   n$3=*&i:int const * [line 13, column 50]\n  *&i:int const *=(n$3 + 1) [line 13, column 50]\n " shape="box"]
+	 "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_4" -> "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_3" ;
+"X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_5" [label="5:  UnaryOperator \n   n$3=*&i:int const * [line 13, column 50]\n  *&i:int const *=(n$3 + 1) [line 13, column 50]\n " shape="box"]
 	
 
-	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_5" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_3" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" [label="6:  BinaryOperatorStmt: NE \n   n$4=*&i:int const * [line 13, column 33]\n  n$5=*&list:std::initializer_list<int>& [line 13, column 38]\n  _=*n$5:std::initializer_list<int> [line 13, column 38]\n  n$7=_fun_std::initializer_list<int>::end(n$5:std::initializer_list<int>&) [line 13, column 38]\n " shape="box"]
+	 "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_5" -> "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_3" ;
+"X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_6" [label="6:  BinaryOperatorStmt: NE \n   n$4=*&i:int const * [line 13, column 33]\n  n$5=*&list:std::initializer_list<int>& [line 13, column 38]\n  _=*n$5:std::initializer_list<int> [line 13, column 38]\n  n$7=_fun_std::initializer_list<int>::end(n$5:std::initializer_list<int>&) [line 13, column 38]\n " shape="box"]
 	
 
-	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_7" ;
-	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_6" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_8" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_7" [label="7: Prune (true branch, for loop) \n   PRUNE((n$4 != n$7), true); [line 13, column 33]\n " shape="invhouse"]
+	 "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_6" -> "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_7" ;
+	 "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_6" -> "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_8" ;
+"X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_7" [label="7: Prune (true branch, for loop) \n   PRUNE((n$4 != n$7), true); [line 13, column 33]\n " shape="invhouse"]
 	
 
-	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_7" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_9" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_8" [label="8: Prune (false branch, for loop) \n   PRUNE(!(n$4 != n$7), false); [line 13, column 33]\n " shape="invhouse"]
+	 "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_7" -> "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_9" ;
+"X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_8" [label="8: Prune (false branch, for loop) \n   PRUNE(!(n$4 != n$7), false); [line 13, column 33]\n " shape="invhouse"]
 	
 
-	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_8" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_2" ;
-"X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_9" [label="9:  BinaryOperatorStmt: Assign \n   n$8=*&this:X* [line 14, column 7]\n  n$9=*&this:X* [line 14, column 13]\n  n$10=*n$9.sum:int [line 14, column 13]\n  n$11=*&i:int const * [line 14, column 20]\n  n$12=*n$11:int [line 14, column 19]\n  *n$8.sum:int=(n$10 + n$12) [line 14, column 7]\n " shape="box"]
+	 "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_8" -> "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_2" ;
+"X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_9" [label="9:  BinaryOperatorStmt: Assign \n   n$8=*&this:X* [line 14, column 7]\n  n$9=*&this:X* [line 14, column 13]\n  n$10=*n$9.sum:int [line 14, column 13]\n  n$11=*&i:int const * [line 14, column 20]\n  n$12=*n$11:int [line 14, column 19]\n  *n$8.sum:int=(n$10 + n$12) [line 14, column 7]\n " shape="box"]
 	
 
-	 "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_9" -> "X#X#{15236476731743367432}.ce83f097b510e48ce3d42aa5df1bb3be_5" ;
+	 "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_9" -> "X#X#{1065863404316007821}.20931c4c04f455f4d98a49d14148be28_5" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/constructors/temp_object.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/constructors/temp_object.cpp.dot
index fd14f140f..c24ba1740 100644
--- a/infer/tests/codetoanalyze/cpp/shared/constructors/temp_object.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/constructors/temp_object.cpp.dot
@@ -213,37 +213,37 @@ digraph cfg {
 	
 
 	 "div#X#temp_object#(12460299690567563818).008eb806654973dcd60bef3460e7ab63_4" -> "div#X#temp_object#(12460299690567563818).008eb806654973dcd60bef3460e7ab63_2" ;
-"X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_1" [label="1: Start temp_object::X::X\nFormals:  this:temp_object::X* x:temp_object::X const &\nLocals:  \n  " color=yellow style=filled]
+"X#X#temp_object#{12231838181691886121}.38f720bcfdd216037b161fc1f84ba92b_1" [label="1: Start temp_object::X::X\nFormals:  this:temp_object::X* a:int b:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_1" -> "X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_3" ;
-"X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_2" [label="2: Exit temp_object::X::X \n  " color=yellow style=filled]
+	 "X#X#temp_object#{12231838181691886121}.38f720bcfdd216037b161fc1f84ba92b_1" -> "X#X#temp_object#{12231838181691886121}.38f720bcfdd216037b161fc1f84ba92b_3" ;
+"X#X#temp_object#{12231838181691886121}.38f720bcfdd216037b161fc1f84ba92b_2" [label="2: Exit temp_object::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 14, column 19]\n  n$1=*&x:temp_object::X const & [line 14, column 23]\n  n$2=*n$1.f:int [line 14, column 23]\n  *n$0.f:int=n$2 [line 14, column 19]\n " shape="box"]
+"X#X#temp_object#{12231838181691886121}.38f720bcfdd216037b161fc1f84ba92b_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 12, column 21]\n  n$1=*&a:int [line 12, column 25]\n  *n$0.f:int=n$1 [line 12, column 21]\n " shape="box"]
 	
 
-	 "X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_3" -> "X#X#temp_object#{5376484276992466061}.a1cfaf9ee9d8c713d3d1751acbb77f32_2" ;
-"X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_1" [label="1: Start temp_object::X::X\nFormals:  this:temp_object::X* a:int b:int\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#temp_object#{12231838181691886121}.38f720bcfdd216037b161fc1f84ba92b_3" -> "X#X#temp_object#{12231838181691886121}.38f720bcfdd216037b161fc1f84ba92b_2" ;
+"X#X#temp_object#{14498489846246706072}.92449f6f4b90b4f036ed6bcf9c78f797_1" [label="1: Start temp_object::X::X\nFormals:  this:temp_object::X* x:temp_object::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_1" -> "X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_3" ;
-"X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_2" [label="2: Exit temp_object::X::X \n  " color=yellow style=filled]
+	 "X#X#temp_object#{14498489846246706072}.92449f6f4b90b4f036ed6bcf9c78f797_1" -> "X#X#temp_object#{14498489846246706072}.92449f6f4b90b4f036ed6bcf9c78f797_3" ;
+"X#X#temp_object#{14498489846246706072}.92449f6f4b90b4f036ed6bcf9c78f797_2" [label="2: Exit temp_object::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 12, column 21]\n  n$1=*&a:int [line 12, column 25]\n  *n$0.f:int=n$1 [line 12, column 21]\n " shape="box"]
+"X#X#temp_object#{14498489846246706072}.92449f6f4b90b4f036ed6bcf9c78f797_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 14, column 19]\n  n$1=*&x:temp_object::X const & [line 14, column 23]\n  n$2=*n$1.f:int [line 14, column 23]\n  *n$0.f:int=n$2 [line 14, column 19]\n " shape="box"]
 	
 
-	 "X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_3" -> "X#X#temp_object#{8598480124712426466}.7071c692af425a15518693ebe50ba781_2" ;
-"X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_1" [label="1: Start temp_object::X::X\nFormals:  this:temp_object::X* a:int\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#temp_object#{14498489846246706072}.92449f6f4b90b4f036ed6bcf9c78f797_3" -> "X#X#temp_object#{14498489846246706072}.92449f6f4b90b4f036ed6bcf9c78f797_2" ;
+"X#X#temp_object#{7690616887655186138}.f2d203761081921c7fa2fe0f9e19da98_1" [label="1: Start temp_object::X::X\nFormals:  this:temp_object::X* a:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_1" -> "X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_3" ;
-"X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_2" [label="2: Exit temp_object::X::X \n  " color=yellow style=filled]
+	 "X#X#temp_object#{7690616887655186138}.f2d203761081921c7fa2fe0f9e19da98_1" -> "X#X#temp_object#{7690616887655186138}.f2d203761081921c7fa2fe0f9e19da98_3" ;
+"X#X#temp_object#{7690616887655186138}.f2d203761081921c7fa2fe0f9e19da98_2" [label="2: Exit temp_object::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 11, column 14]\n  n$1=*&a:int [line 11, column 18]\n  *n$0.f:int=n$1 [line 11, column 14]\n " shape="box"]
+"X#X#temp_object#{7690616887655186138}.f2d203761081921c7fa2fe0f9e19da98_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:temp_object::X* [line 11, column 14]\n  n$1=*&a:int [line 11, column 18]\n  *n$0.f:int=n$1 [line 11, column 14]\n " shape="box"]
 	
 
-	 "X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_3" -> "X#X#temp_object#{9561113765655638015}.59d66724d587fdb6aca1a26e1f705f23_2" ;
+	 "X#X#temp_object#{7690616887655186138}.f2d203761081921c7fa2fe0f9e19da98_3" -> "X#X#temp_object#{7690616887655186138}.f2d203761081921c7fa2fe0f9e19da98_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/lambda/lambda1.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/lambda/lambda1.cpp.dot
index f4a042040..27266c92f 100644
--- a/infer/tests/codetoanalyze/cpp/shared/lambda/lambda1.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/lambda/lambda1.cpp.dot
@@ -660,42 +660,42 @@ digraph cfg {
 	
 
 	 "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_6" -> "capture_this_with_equal#Capture#(805776379555510952).ecd73e9a4e2bef0d060a242b61508f10_4" ;
-"Capture#Capture#{12117490113068134497|constexpr}.98ffcc03a8acaf01f37e687e09517440_1" [label="1: Start Capture::Capture\nFormals:  this:Capture* __param_0:Capture&\nLocals:  \n  " color=yellow style=filled]
+"Capture#Capture#{10472795509406479532|constexpr}.087b5cb1e1aa63ebe2854b623332e2d3_1" [label="1: Start Capture::Capture\nFormals:  this:Capture* __param_0:Capture&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Capture#Capture#{12117490113068134497|constexpr}.98ffcc03a8acaf01f37e687e09517440_1" -> "Capture#Capture#{12117490113068134497|constexpr}.98ffcc03a8acaf01f37e687e09517440_2" ;
-"Capture#Capture#{12117490113068134497|constexpr}.98ffcc03a8acaf01f37e687e09517440_2" [label="2: Exit Capture::Capture \n  " color=yellow style=filled]
+	 "Capture#Capture#{10472795509406479532|constexpr}.087b5cb1e1aa63ebe2854b623332e2d3_1" -> "Capture#Capture#{10472795509406479532|constexpr}.087b5cb1e1aa63ebe2854b623332e2d3_2" ;
+"Capture#Capture#{10472795509406479532|constexpr}.087b5cb1e1aa63ebe2854b623332e2d3_2" [label="2: Exit Capture::Capture \n  " color=yellow style=filled]
 	
 
-"Capture#Capture#{15371931494294124755|constexpr}.9ede96f2e081983279c43accbd64cbd2_1" [label="1: Start Capture::Capture\nFormals:  this:Capture* __param_0:Capture const &\nLocals:  \n  " color=yellow style=filled]
+"Capture#Capture#{15212015590962885360|constexpr}.88c835b802b970a70179973e7602cd15_1" [label="1: Start Capture::Capture\nFormals:  this:Capture* __param_0:Capture const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Capture#Capture#{15371931494294124755|constexpr}.9ede96f2e081983279c43accbd64cbd2_1" -> "Capture#Capture#{15371931494294124755|constexpr}.9ede96f2e081983279c43accbd64cbd2_2" ;
-"Capture#Capture#{15371931494294124755|constexpr}.9ede96f2e081983279c43accbd64cbd2_2" [label="2: Exit Capture::Capture \n  " color=yellow style=filled]
+	 "Capture#Capture#{15212015590962885360|constexpr}.88c835b802b970a70179973e7602cd15_1" -> "Capture#Capture#{15212015590962885360|constexpr}.88c835b802b970a70179973e7602cd15_2" ;
+"Capture#Capture#{15212015590962885360|constexpr}.88c835b802b970a70179973e7602cd15_2" [label="2: Exit Capture::Capture \n  " color=yellow style=filled]
 	
 
-"SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_1" [label="1: Start SomeStruct::SomeStruct\nFormals:  this:SomeStruct* __param_0:SomeStruct const &\nLocals:  \n  " color=yellow style=filled]
+"SomeStruct#SomeStruct#{1832607112608272852}.9358ad7e8cb71def413c8639fcfb12ec_1" [label="1: Start SomeStruct::SomeStruct\nFormals:  this:SomeStruct*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_1" -> "SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_3" ;
-"SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_2" [label="2: Exit SomeStruct::SomeStruct \n  " color=yellow style=filled]
+	 "SomeStruct#SomeStruct#{1832607112608272852}.9358ad7e8cb71def413c8639fcfb12ec_1" -> "SomeStruct#SomeStruct#{1832607112608272852}.9358ad7e8cb71def413c8639fcfb12ec_2" ;
+"SomeStruct#SomeStruct#{1832607112608272852}.9358ad7e8cb71def413c8639fcfb12ec_2" [label="2: Exit SomeStruct::SomeStruct \n  " color=yellow style=filled]
 	
 
-"SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_3" [label="3:  Constructor Init \n   n$1=*&this:SomeStruct* [line 69, column 8]\n " shape="box"]
+"SomeStruct#SomeStruct#{5541518238443553971|constexpr}.d5f0dc01da381f40bfe0baa2cd7ae5ce_1" [label="1: Start SomeStruct::SomeStruct\nFormals:  this:SomeStruct* __param_0:SomeStruct const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_3" -> "SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_4" ;
-"SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_4" [label="4:  Constructor Init \n   n$2=*&__param_0:SomeStruct const & [line 69, column 8]\n  n$3=*n$2.f:int [line 69, column 8]\n  *n$1.f:int=n$3 [line 69, column 8]\n " shape="box"]
+	 "SomeStruct#SomeStruct#{5541518238443553971|constexpr}.d5f0dc01da381f40bfe0baa2cd7ae5ce_1" -> "SomeStruct#SomeStruct#{5541518238443553971|constexpr}.d5f0dc01da381f40bfe0baa2cd7ae5ce_3" ;
+"SomeStruct#SomeStruct#{5541518238443553971|constexpr}.d5f0dc01da381f40bfe0baa2cd7ae5ce_2" [label="2: Exit SomeStruct::SomeStruct \n  " color=yellow style=filled]
 	
 
-	 "SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_4" -> "SomeStruct#SomeStruct#{11805166137496297040|constexpr}.1073d62b309830aceab7dd0d11fb9801_2" ;
-"SomeStruct#SomeStruct#{2573478938230069461}.1e11401e11e8aaa8f38010f41863587a_1" [label="1: Start SomeStruct::SomeStruct\nFormals:  this:SomeStruct*\nLocals:  \n  " color=yellow style=filled]
+"SomeStruct#SomeStruct#{5541518238443553971|constexpr}.d5f0dc01da381f40bfe0baa2cd7ae5ce_3" [label="3:  Constructor Init \n   n$1=*&this:SomeStruct* [line 69, column 8]\n " shape="box"]
 	
 
-	 "SomeStruct#SomeStruct#{2573478938230069461}.1e11401e11e8aaa8f38010f41863587a_1" -> "SomeStruct#SomeStruct#{2573478938230069461}.1e11401e11e8aaa8f38010f41863587a_2" ;
-"SomeStruct#SomeStruct#{2573478938230069461}.1e11401e11e8aaa8f38010f41863587a_2" [label="2: Exit SomeStruct::SomeStruct \n  " color=yellow style=filled]
+	 "SomeStruct#SomeStruct#{5541518238443553971|constexpr}.d5f0dc01da381f40bfe0baa2cd7ae5ce_3" -> "SomeStruct#SomeStruct#{5541518238443553971|constexpr}.d5f0dc01da381f40bfe0baa2cd7ae5ce_4" ;
+"SomeStruct#SomeStruct#{5541518238443553971|constexpr}.d5f0dc01da381f40bfe0baa2cd7ae5ce_4" [label="4:  Constructor Init \n   n$2=*&__param_0:SomeStruct const & [line 69, column 8]\n  n$3=*n$2.f:int [line 69, column 8]\n  *n$1.f:int=n$3 [line 69, column 8]\n " shape="box"]
 	
 
+	 "SomeStruct#SomeStruct#{5541518238443553971|constexpr}.d5f0dc01da381f40bfe0baa2cd7ae5ce_4" -> "SomeStruct#SomeStruct#{5541518238443553971|constexpr}.d5f0dc01da381f40bfe0baa2cd7ae5ce_2" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:100:3#ref_capture_by_ref#(15477827616000637094).56cb75c27348be51b0ee798d7fb8600c_1" [label="1: Start ref_capture_by_ref::lambda_shared_lambda_lambda1.cpp:100:3::operator()\nFormals:  this:ref_capture_by_ref::lambda_shared_lambda_lambda1.cpp:100:3*\nLocals: \nCaptured:  [by ref]xref:int& \n  " color=yellow style=filled]
 	
 
@@ -733,51 +733,51 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(2150129997065521100).a616841500faf5cf766ee05bebfd495b_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(2150129997065521100).a616841500faf5cf766ee05bebfd495b_2" ;
-"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_1" [label="1: Start struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::\nFormals:  this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12* __param_0:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_1" [label="1: Start struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::\nFormals:  this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12* __param_0:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_1" -> "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_5" ;
-"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_2" [label="2: Exit struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_1" -> "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_5" ;
+"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_2" [label="2: Exit struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_3" [label="3:  Constructor Init \n   n$1=*&this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12* [line 114, column 12]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_3" [label="3:  Constructor Init \n   n$1=*&this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12* [line 114, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_3" -> "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_4" ;
-"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12& [line 114, column 12]\n  n$3=_fun_SomeStruct::SomeStruct(n$1.__anon_field_1:SomeStruct*,n$2.__anon_field_1:SomeStruct&) [line 114, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_3" -> "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_4" ;
+"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12& [line 114, column 12]\n  n$3=_fun_SomeStruct::SomeStruct(n$1.__anon_field_1:SomeStruct*,n$2.__anon_field_1:SomeStruct&) [line 114, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_4" -> "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_2" ;
-"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_5" [label="5:  Constructor Init \n   n$4=*&this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12* [line 114, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_4" -> "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_2" ;
+"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_5" [label="5:  Constructor Init \n   n$4=*&this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12* [line 114, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_5" -> "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_6" ;
-"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_6" [label="6:  Constructor Init \n   n$5=*&__param_0:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12& [line 114, column 12]\n  n$6=_fun_SomeStruct::SomeStruct(n$4.__anon_field_0:SomeStruct*,n$5.__anon_field_0:SomeStruct&) [line 114, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_5" -> "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_6" ;
+"#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_6" [label="6:  Constructor Init \n   n$5=*&__param_0:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12& [line 114, column 12]\n  n$6=_fun_SomeStruct::SomeStruct(n$4.__anon_field_0:SomeStruct*,n$5.__anon_field_0:SomeStruct&) [line 114, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_6" -> "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{13645807577265137289|constexpr}.dba87605d9600d73831555b42c7a4abc_3" ;
-"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491.545332b09abfd9c634eb359cdb55ab7a_1" [label="1: Start struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::__infer_inner_destructor_~\nFormals:  this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12*\nLocals:  \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_6" -> "#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#{16388855054768398388|constexpr}.f83b33b8c3e61470e10d2b7f9620cc4a_3" ;
+"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905.f3b475894d73b25ae7a9c83e3bdfd3b6_1" [label="1: Start struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::__infer_inner_destructor_~\nFormals:  this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491.545332b09abfd9c634eb359cdb55ab7a_1" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491.545332b09abfd9c634eb359cdb55ab7a_3" ;
-"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491.545332b09abfd9c634eb359cdb55ab7a_2" [label="2: Exit struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::__infer_inner_destructor_~ \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905.f3b475894d73b25ae7a9c83e3bdfd3b6_1" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905.f3b475894d73b25ae7a9c83e3bdfd3b6_3" ;
+"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905.f3b475894d73b25ae7a9c83e3bdfd3b6_2" [label="2: Exit struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::__infer_inner_destructor_~ \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491.545332b09abfd9c634eb359cdb55ab7a_3" [label="3:  Destruction(fields) \n   n$0=*&this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12* [line 114, column 12]\n  _=*n$0.__anon_field_1:SomeStruct [line 114, column 12]\n  n$4=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_1:SomeStruct*) injected [line 114, column 12]\n  _=*n$0.__anon_field_0:SomeStruct [line 114, column 12]\n  n$2=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_0:SomeStruct*) injected [line 114, column 12]\n " shape="box"]
+"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905.f3b475894d73b25ae7a9c83e3bdfd3b6_3" [label="3:  Destruction(fields) \n   n$0=*&this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12* [line 114, column 12]\n  _=*n$0.__anon_field_1:SomeStruct [line 114, column 12]\n  n$4=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_1:SomeStruct*) injected [line 114, column 12]\n  _=*n$0.__anon_field_0:SomeStruct [line 114, column 12]\n  n$2=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_0:SomeStruct*) injected [line 114, column 12]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491.545332b09abfd9c634eb359cdb55ab7a_3" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491.545332b09abfd9c634eb359cdb55ab7a_2" ;
-"~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491785611400776).5b5ee303155b65a639cd4a9305fffe28_1" [label="1: Start struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::~\nFormals:  this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905.f3b475894d73b25ae7a9c83e3bdfd3b6_3" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905.f3b475894d73b25ae7a9c83e3bdfd3b6_2" ;
+"~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905875255252162).d65c362562498a003b1c1f4cb79fe557_1" [label="1: Start struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::~\nFormals:  this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491785611400776).5b5ee303155b65a639cd4a9305fffe28_1" -> "~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491785611400776).5b5ee303155b65a639cd4a9305fffe28_3" ;
-"~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491785611400776).5b5ee303155b65a639cd4a9305fffe28_2" [label="2: Exit struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::~ \n  " color=yellow style=filled]
+	 "~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905875255252162).d65c362562498a003b1c1f4cb79fe557_1" -> "~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905875255252162).d65c362562498a003b1c1f4cb79fe557_3" ;
+"~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905875255252162).d65c362562498a003b1c1f4cb79fe557_2" [label="2: Exit struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::~ \n  " color=yellow style=filled]
 	
 
-"~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491785611400776).5b5ee303155b65a639cd4a9305fffe28_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12* [line 114, column 12]\n  _=*n$0:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12 [line 114, column 12]\n  n$2=_fun_struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::__infer_inner_destructor_~(n$0:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12*) injected [line 114, column 12]\n " shape="box"]
+"~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905875255252162).d65c362562498a003b1c1f4cb79fe557_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12* [line 114, column 12]\n  _=*n$0:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12 [line 114, column 12]\n  n$2=_fun_struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12::__infer_inner_destructor_~(n$0:struct_capture_by_value::lambda_shared_lambda_lambda1.cpp:114:12*) injected [line 114, column 12]\n " shape="box"]
 	
 
-	 "~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491785611400776).5b5ee303155b65a639cd4a9305fffe28_3" -> "~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(11678491785611400776).5b5ee303155b65a639cd4a9305fffe28_2" ;
+	 "~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905875255252162).d65c362562498a003b1c1f4cb79fe557_3" -> "~#lambda_shared_lambda_lambda1.cpp:114:12#struct_capture_by_value#(12926905875255252162).d65c362562498a003b1c1f4cb79fe557_2" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#(9710896582584402087).3e1da6a0d3e429a6201a7347f66f8e41_1" [label="1: Start struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12::operator()\nFormals:  this:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12*\nLocals: \nCaptured:  [by ref]x:SomeStruct& [by ref]xref:SomeStruct& \n  " color=yellow style=filled]
 	
 
@@ -797,29 +797,29 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#(9710896582584402087).3e1da6a0d3e429a6201a7347f66f8e41_5" -> "operator()#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#(9710896582584402087).3e1da6a0d3e429a6201a7347f66f8e41_3" ;
-"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_1" [label="1: Start struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12::\nFormals:  this:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12* __param_0:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_1" [label="1: Start struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12::\nFormals:  this:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12* __param_0:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_1" -> "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_5" ;
-"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_2" [label="2: Exit struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_1" -> "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_5" ;
+"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_2" [label="2: Exit struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_3" [label="3:  Constructor Init \n   n$1=*&this:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12* [line 121, column 12]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_3" [label="3:  Constructor Init \n   n$1=*&this:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12* [line 121, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_3" -> "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_4" ;
-"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12& [line 121, column 12]\n  n$3=*n$2.__anon_field_1:SomeStruct& [line 121, column 12]\n  *n$1.__anon_field_1:SomeStruct&=n$3 [line 121, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_3" -> "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_4" ;
+"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12& [line 121, column 12]\n  n$3=*n$2.__anon_field_1:SomeStruct& [line 121, column 12]\n  *n$1.__anon_field_1:SomeStruct&=n$3 [line 121, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_4" -> "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_2" ;
-"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_5" [label="5:  Constructor Init \n   n$4=*&this:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12* [line 121, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_4" -> "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_2" ;
+"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_5" [label="5:  Constructor Init \n   n$4=*&this:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12* [line 121, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_5" -> "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_6" ;
-"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_6" [label="6:  Constructor Init \n   n$5=*&__param_0:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12& [line 121, column 12]\n  n$6=*n$5.__anon_field_0:SomeStruct& [line 121, column 12]\n  *n$4.__anon_field_0:SomeStruct&=n$6 [line 121, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_5" -> "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_6" ;
+"#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_6" [label="6:  Constructor Init \n   n$5=*&__param_0:struct_capture_by_ref::lambda_shared_lambda_lambda1.cpp:121:12& [line 121, column 12]\n  n$6=*n$5.__anon_field_0:SomeStruct& [line 121, column 12]\n  *n$4.__anon_field_0:SomeStruct&=n$6 [line 121, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_6" -> "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{1974733024656549806|constexpr}.39e1512cd756edc92080d82b97a154c1_3" ;
+	 "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_6" -> "#lambda_shared_lambda_lambda1.cpp:121:12#struct_capture_by_ref#{123610027387660167|constexpr}.f7775ff055389fefba5ff95d2301a74b_3" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(6823593690086374986.1d7d285fdfd1a95971f481bea86bd0d2_1" [label="1: Start struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::operator()\nFormals:  this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12*\nLocals: \nCaptured:  [by value]xlambda:SomeStruct& [by value]xreflambda:SomeStruct& \n  " color=yellow style=filled]
 	
 
@@ -835,51 +835,51 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(6823593690086374986.1d7d285fdfd1a95971f481bea86bd0d2_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(6823593690086374986.1d7d285fdfd1a95971f481bea86bd0d2_2" ;
-"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_1" [label="1: Start struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::\nFormals:  this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12* __param_0:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_1" [label="1: Start struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::\nFormals:  this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12* __param_0:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_1" -> "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_5" ;
-"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_2" [label="2: Exit struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_1" -> "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_5" ;
+"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_2" [label="2: Exit struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_3" [label="3:  Constructor Init \n   n$1=*&this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12* [line 131, column 12]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_3" [label="3:  Constructor Init \n   n$1=*&this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12* [line 131, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_3" -> "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_4" ;
-"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12& [line 131, column 12]\n  n$3=_fun_SomeStruct::SomeStruct(n$1.__anon_field_1:SomeStruct*,n$2.__anon_field_1:SomeStruct&) [line 131, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_3" -> "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_4" ;
+"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12& [line 131, column 12]\n  n$3=_fun_SomeStruct::SomeStruct(n$1.__anon_field_1:SomeStruct*,n$2.__anon_field_1:SomeStruct&) [line 131, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_4" -> "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_2" ;
-"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_5" [label="5:  Constructor Init \n   n$4=*&this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12* [line 131, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_4" -> "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_2" ;
+"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_5" [label="5:  Constructor Init \n   n$4=*&this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12* [line 131, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_5" -> "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_6" ;
-"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_6" [label="6:  Constructor Init \n   n$5=*&__param_0:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12& [line 131, column 12]\n  n$6=_fun_SomeStruct::SomeStruct(n$4.__anon_field_0:SomeStruct*,n$5.__anon_field_0:SomeStruct&) [line 131, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_5" -> "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_6" ;
+"#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_6" [label="6:  Constructor Init \n   n$5=*&__param_0:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12& [line 131, column 12]\n  n$6=_fun_SomeStruct::SomeStruct(n$4.__anon_field_0:SomeStruct*,n$5.__anon_field_0:SomeStruct&) [line 131, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_6" -> "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{15789958879022209719|constexp.3555741fc1c429408aff0dd2c29de8a1_3" ;
-"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(690.18a0992c6f44dece1391733b4d2504dd_1" [label="1: Start struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::__infer_inner_destructor_~\nFormals:  this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12*\nLocals:  \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_6" -> "#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#{5414798644176225694|constexpr.6315a956bdfd0c9175ac4b5d29791456_3" ;
+"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(565.c3b6f4919c75b80fdd7848286b0ac31f_1" [label="1: Start struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::__infer_inner_destructor_~\nFormals:  this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(690.18a0992c6f44dece1391733b4d2504dd_1" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(690.18a0992c6f44dece1391733b4d2504dd_3" ;
-"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(690.18a0992c6f44dece1391733b4d2504dd_2" [label="2: Exit struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::__infer_inner_destructor_~ \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(565.c3b6f4919c75b80fdd7848286b0ac31f_1" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(565.c3b6f4919c75b80fdd7848286b0ac31f_3" ;
+"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(565.c3b6f4919c75b80fdd7848286b0ac31f_2" [label="2: Exit struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::__infer_inner_destructor_~ \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(690.18a0992c6f44dece1391733b4d2504dd_3" [label="3:  Destruction(fields) \n   n$0=*&this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12* [line 131, column 12]\n  _=*n$0.__anon_field_1:SomeStruct [line 131, column 12]\n  n$4=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_1:SomeStruct*) injected [line 131, column 12]\n  _=*n$0.__anon_field_0:SomeStruct [line 131, column 12]\n  n$2=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_0:SomeStruct*) injected [line 131, column 12]\n " shape="box"]
+"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(565.c3b6f4919c75b80fdd7848286b0ac31f_3" [label="3:  Destruction(fields) \n   n$0=*&this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12* [line 131, column 12]\n  _=*n$0.__anon_field_1:SomeStruct [line 131, column 12]\n  n$4=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_1:SomeStruct*) injected [line 131, column 12]\n  _=*n$0.__anon_field_0:SomeStruct [line 131, column 12]\n  n$2=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_0:SomeStruct*) injected [line 131, column 12]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(690.18a0992c6f44dece1391733b4d2504dd_3" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(690.18a0992c6f44dece1391733b4d2504dd_2" ;
-"~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(6903110340237016690).5b75802af766e8205ce215ef5fec8b65_1" [label="1: Start struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::~\nFormals:  this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(565.c3b6f4919c75b80fdd7848286b0ac31f_3" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(565.c3b6f4919c75b80fdd7848286b0ac31f_2" ;
+"~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(5654696250593165304).4a8108e37df00fe8a0966ab2cd1428bd_1" [label="1: Start struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::~\nFormals:  this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(6903110340237016690).5b75802af766e8205ce215ef5fec8b65_1" -> "~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(6903110340237016690).5b75802af766e8205ce215ef5fec8b65_3" ;
-"~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(6903110340237016690).5b75802af766e8205ce215ef5fec8b65_2" [label="2: Exit struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::~ \n  " color=yellow style=filled]
+	 "~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(5654696250593165304).4a8108e37df00fe8a0966ab2cd1428bd_1" -> "~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(5654696250593165304).4a8108e37df00fe8a0966ab2cd1428bd_3" ;
+"~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(5654696250593165304).4a8108e37df00fe8a0966ab2cd1428bd_2" [label="2: Exit struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::~ \n  " color=yellow style=filled]
 	
 
-"~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(6903110340237016690).5b75802af766e8205ce215ef5fec8b65_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12* [line 131, column 12]\n  _=*n$0:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12 [line 131, column 12]\n  n$2=_fun_struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::__infer_inner_destructor_~(n$0:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12*) injected [line 131, column 12]\n " shape="box"]
+"~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(5654696250593165304).4a8108e37df00fe8a0966ab2cd1428bd_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12* [line 131, column 12]\n  _=*n$0:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12 [line 131, column 12]\n  n$2=_fun_struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12::__infer_inner_destructor_~(n$0:struct_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:131:12*) injected [line 131, column 12]\n " shape="box"]
 	
 
-	 "~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(6903110340237016690).5b75802af766e8205ce215ef5fec8b65_3" -> "~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(6903110340237016690).5b75802af766e8205ce215ef5fec8b65_2" ;
+	 "~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(5654696250593165304).4a8108e37df00fe8a0966ab2cd1428bd_3" -> "~#lambda_shared_lambda_lambda1.cpp:131:12#struct_init_capture_by_value#(5654696250593165304).4a8108e37df00fe8a0966ab2cd1428bd_2" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#(15005887938914111589).35be5232427f26403761e8e1f9bd2f5f_1" [label="1: Start struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12::operator()\nFormals:  this:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12*\nLocals: \nCaptured:  [by ref]xlambda:SomeStruct& [by ref]xreflambda:SomeStruct& \n  " color=yellow style=filled]
 	
 
@@ -899,29 +899,29 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#(15005887938914111589).35be5232427f26403761e8e1f9bd2f5f_5" -> "operator()#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#(15005887938914111589).35be5232427f26403761e8e1f9bd2f5f_3" ;
-"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_1" [label="1: Start struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12::\nFormals:  this:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12* __param_0:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_1" [label="1: Start struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12::\nFormals:  this:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12* __param_0:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_1" -> "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_5" ;
-"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_2" [label="2: Exit struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_1" -> "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_5" ;
+"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_2" [label="2: Exit struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_3" [label="3:  Constructor Init \n   n$1=*&this:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12* [line 140, column 12]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_3" [label="3:  Constructor Init \n   n$1=*&this:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12* [line 140, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_3" -> "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_4" ;
-"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12& [line 140, column 12]\n  n$3=*n$2.__anon_field_1:SomeStruct& [line 140, column 12]\n  *n$1.__anon_field_1:SomeStruct&=n$3 [line 140, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_3" -> "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_4" ;
+"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12& [line 140, column 12]\n  n$3=*n$2.__anon_field_1:SomeStruct& [line 140, column 12]\n  *n$1.__anon_field_1:SomeStruct&=n$3 [line 140, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_4" -> "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_2" ;
-"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_5" [label="5:  Constructor Init \n   n$4=*&this:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12* [line 140, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_4" -> "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_2" ;
+"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_5" [label="5:  Constructor Init \n   n$4=*&this:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12* [line 140, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_5" -> "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_6" ;
-"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_6" [label="6:  Constructor Init \n   n$5=*&__param_0:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12& [line 140, column 12]\n  n$6=*n$5.__anon_field_0:SomeStruct& [line 140, column 12]\n  *n$4.__anon_field_0:SomeStruct&=n$6 [line 140, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_5" -> "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_6" ;
+"#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_6" [label="6:  Constructor Init \n   n$5=*&__param_0:struct_init_capture_by_ref::lambda_shared_lambda_lambda1.cpp:140:12& [line 140, column 12]\n  n$6=*n$5.__anon_field_0:SomeStruct& [line 140, column 12]\n  *n$4.__anon_field_0:SomeStruct&=n$6 [line 140, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_6" -> "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{16372812745381643860|constexpr}.7a71c7a8c4c589c871bec44759f66533_3" ;
+	 "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_6" -> "#lambda_shared_lambda_lambda1.cpp:140:12#struct_init_capture_by_ref#{905135172617509289|constexpr}.b669d1a6eafb74ffefc1a9d88bd1d6d2_3" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:17:17#foo#(10761403337571939980).fc34b2fdd4414d044515387308a2caa2_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:17:17::operator()\nFormals:  this:foo::lambda_shared_lambda_lambda1.cpp:17:17*\nLocals:  \n  " color=yellow style=filled]
 	
 
@@ -933,11 +933,11 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:17:17#foo#(10761403337571939980).fc34b2fdd4414d044515387308a2caa2_3" -> "operator()#lambda_shared_lambda_lambda1.cpp:17:17#foo#(10761403337571939980).fc34b2fdd4414d044515387308a2caa2_2" ;
-"#lambda_shared_lambda_lambda1.cpp:17:17#foo#{18379037134042516079|constexpr}.10ec5a1087f85868c2efc5ca3c13944b_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:17:17::\nFormals:  this:foo::lambda_shared_lambda_lambda1.cpp:17:17* __param_0:foo::lambda_shared_lambda_lambda1.cpp:17:17&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:17:17#foo#{6546711543298386294|constexpr}.e3fe0cc6b3f85877eafc8e8e47c95e31_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:17:17::\nFormals:  this:foo::lambda_shared_lambda_lambda1.cpp:17:17* __param_0:foo::lambda_shared_lambda_lambda1.cpp:17:17&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:17:17#foo#{18379037134042516079|constexpr}.10ec5a1087f85868c2efc5ca3c13944b_1" -> "#lambda_shared_lambda_lambda1.cpp:17:17#foo#{18379037134042516079|constexpr}.10ec5a1087f85868c2efc5ca3c13944b_2" ;
-"#lambda_shared_lambda_lambda1.cpp:17:17#foo#{18379037134042516079|constexpr}.10ec5a1087f85868c2efc5ca3c13944b_2" [label="2: Exit foo::lambda_shared_lambda_lambda1.cpp:17:17:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:17:17#foo#{6546711543298386294|constexpr}.e3fe0cc6b3f85877eafc8e8e47c95e31_1" -> "#lambda_shared_lambda_lambda1.cpp:17:17#foo#{6546711543298386294|constexpr}.e3fe0cc6b3f85877eafc8e8e47c95e31_2" ;
+"#lambda_shared_lambda_lambda1.cpp:17:17#foo#{6546711543298386294|constexpr}.e3fe0cc6b3f85877eafc8e8e47c95e31_2" [label="2: Exit foo::lambda_shared_lambda_lambda1.cpp:17:17:: \n  " color=yellow style=filled]
 	
 
 "operator()#lambda_shared_lambda_lambda1.cpp:18:12#foo#(8701050879076719020).0d4a964c0bde8f0dc1ee0d35ffa2f29c_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:18:12::operator()\nFormals:  this:foo::lambda_shared_lambda_lambda1.cpp:18:12* i:int\nLocals:  \n  " color=yellow style=filled]
@@ -955,11 +955,11 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:18:12#foo#(8701050879076719020).0d4a964c0bde8f0dc1ee0d35ffa2f29c_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:18:12#foo#(8701050879076719020).0d4a964c0bde8f0dc1ee0d35ffa2f29c_2" ;
-"#lambda_shared_lambda_lambda1.cpp:18:12#foo#{2457771116144546786|constexpr}.c00e98ad40878efac6212763d91f37b3_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:18:12::\nFormals:  this:foo::lambda_shared_lambda_lambda1.cpp:18:12* __param_0:foo::lambda_shared_lambda_lambda1.cpp:18:12&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:18:12#foo#{14097994618464478171|constexpr}.e9a91eabc1a9d1f1795f8fe14615cf35_1" [label="1: Start foo::lambda_shared_lambda_lambda1.cpp:18:12::\nFormals:  this:foo::lambda_shared_lambda_lambda1.cpp:18:12* __param_0:foo::lambda_shared_lambda_lambda1.cpp:18:12&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:18:12#foo#{2457771116144546786|constexpr}.c00e98ad40878efac6212763d91f37b3_1" -> "#lambda_shared_lambda_lambda1.cpp:18:12#foo#{2457771116144546786|constexpr}.c00e98ad40878efac6212763d91f37b3_2" ;
-"#lambda_shared_lambda_lambda1.cpp:18:12#foo#{2457771116144546786|constexpr}.c00e98ad40878efac6212763d91f37b3_2" [label="2: Exit foo::lambda_shared_lambda_lambda1.cpp:18:12:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:18:12#foo#{14097994618464478171|constexpr}.e9a91eabc1a9d1f1795f8fe14615cf35_1" -> "#lambda_shared_lambda_lambda1.cpp:18:12#foo#{14097994618464478171|constexpr}.e9a91eabc1a9d1f1795f8fe14615cf35_2" ;
+"#lambda_shared_lambda_lambda1.cpp:18:12#foo#{14097994618464478171|constexpr}.e9a91eabc1a9d1f1795f8fe14615cf35_2" [label="2: Exit foo::lambda_shared_lambda_lambda1.cpp:18:12:: \n  " color=yellow style=filled]
 	
 
 "operator()#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#(3436637400147523223).b3368025c545000668e9fb87b5c89aa4_1" [label="1: Start fooOK::lambda_shared_lambda_lambda1.cpp:24:12::operator()\nFormals:  this:fooOK::lambda_shared_lambda_lambda1.cpp:24:12* i:int\nLocals:  \n  " color=yellow style=filled]
@@ -977,11 +977,11 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#(3436637400147523223).b3368025c545000668e9fb87b5c89aa4_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#(3436637400147523223).b3368025c545000668e9fb87b5c89aa4_2" ;
-"#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#{12805486487749307717|constexpr}.5e8e5a47f663bbae0aeb80a4152608e7_1" [label="1: Start fooOK::lambda_shared_lambda_lambda1.cpp:24:12::\nFormals:  this:fooOK::lambda_shared_lambda_lambda1.cpp:24:12* __param_0:fooOK::lambda_shared_lambda_lambda1.cpp:24:12&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#{9771638492353064448|constexpr}.d1f3778d31393b08d2528ebeac915cba_1" [label="1: Start fooOK::lambda_shared_lambda_lambda1.cpp:24:12::\nFormals:  this:fooOK::lambda_shared_lambda_lambda1.cpp:24:12* __param_0:fooOK::lambda_shared_lambda_lambda1.cpp:24:12&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#{12805486487749307717|constexpr}.5e8e5a47f663bbae0aeb80a4152608e7_1" -> "#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#{12805486487749307717|constexpr}.5e8e5a47f663bbae0aeb80a4152608e7_2" ;
-"#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#{12805486487749307717|constexpr}.5e8e5a47f663bbae0aeb80a4152608e7_2" [label="2: Exit fooOK::lambda_shared_lambda_lambda1.cpp:24:12:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#{9771638492353064448|constexpr}.d1f3778d31393b08d2528ebeac915cba_1" -> "#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#{9771638492353064448|constexpr}.d1f3778d31393b08d2528ebeac915cba_2" ;
+"#lambda_shared_lambda_lambda1.cpp:24:12#fooOK#{9771638492353064448|constexpr}.d1f3778d31393b08d2528ebeac915cba_2" [label="2: Exit fooOK::lambda_shared_lambda_lambda1.cpp:24:12:: \n  " color=yellow style=filled]
 	
 
 "operator()#lambda_shared_lambda_lambda1.cpp:31:10#normal_capture#(3336792892144266867).563aa24976a73c4ea364dbb5afa3f73f_1" [label="1: Start normal_capture::lambda_shared_lambda_lambda1.cpp:31:10::operator()\nFormals:  this:normal_capture::lambda_shared_lambda_lambda1.cpp:31:10*\nLocals: \nCaptured:  [by value]x:int [by value]y:int \n  " color=yellow style=filled]
@@ -1055,21 +1055,21 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#(1084455887557995828.1d62aec1dfb3de86dac2a9a51e124083_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#(1084455887557995828.1d62aec1dfb3de86dac2a9a51e124083_2" ;
-"#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_1" [label="1: Start Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19::\nFormals:  this:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19* __param_0:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{17085426441918021560|constexp.007183ebc5eafd9047dc4bf6429d6a5a_1" [label="1: Start Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19::\nFormals:  this:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19* __param_0:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_1" -> "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_3" ;
-"#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_2" [label="2: Exit Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{17085426441918021560|constexp.007183ebc5eafd9047dc4bf6429d6a5a_1" -> "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{17085426441918021560|constexp.007183ebc5eafd9047dc4bf6429d6a5a_3" ;
+"#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{17085426441918021560|constexp.007183ebc5eafd9047dc4bf6429d6a5a_2" [label="2: Exit Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19* [line 51, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{17085426441918021560|constexp.007183ebc5eafd9047dc4bf6429d6a5a_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19* [line 51, column 19]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_3" -> "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_4" ;
-"#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19& [line 51, column 19]\n  n$3=*n$2.__anon_field_0:Capture* [line 51, column 19]\n  *n$1.__anon_field_0:Capture*=n$3 [line 51, column 19]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{17085426441918021560|constexp.007183ebc5eafd9047dc4bf6429d6a5a_3" -> "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{17085426441918021560|constexp.007183ebc5eafd9047dc4bf6429d6a5a_4" ;
+"#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{17085426441918021560|constexp.007183ebc5eafd9047dc4bf6429d6a5a_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Capture::capture_this_explicit::lambda_shared_lambda_lambda1.cpp:51:19& [line 51, column 19]\n  n$3=*n$2.__anon_field_0:Capture* [line 51, column 19]\n  *n$1.__anon_field_0:Capture*=n$3 [line 51, column 19]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_4" -> "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{15581681824770184595|constexp.7bc69d386faff7f8ffc9dc392a5988cf_2" ;
+	 "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{17085426441918021560|constexp.007183ebc5eafd9047dc4bf6429d6a5a_4" -> "#lambda_shared_lambda_lambda1.cpp:51:19#capture_this_explicit#Capture#{17085426441918021560|constexp.007183ebc5eafd9047dc4bf6429d6a5a_2" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#(11891233366713773989).2f1caaa7509ffca98027857cb192891f_1" [label="1: Start Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19::operator()\nFormals:  this:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19*\nLocals: \nCaptured:  [by value]this:Capture* \n  " color=yellow style=filled]
 	
 
@@ -1077,21 +1077,21 @@ digraph cfg {
 "operator()#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#(11891233366713773989).2f1caaa7509ffca98027857cb192891f_2" [label="2: Exit Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19::operator() \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_1" [label="1: Start Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19::\nFormals:  this:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19* __param_0:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{10959385173560663663|constexpr}.987a67e2a61b4710b1310d7c9a030493_1" [label="1: Start Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19::\nFormals:  this:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19* __param_0:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_1" -> "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_3" ;
-"#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_2" [label="2: Exit Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{10959385173560663663|constexpr}.987a67e2a61b4710b1310d7c9a030493_1" -> "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{10959385173560663663|constexpr}.987a67e2a61b4710b1310d7c9a030493_3" ;
+"#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{10959385173560663663|constexpr}.987a67e2a61b4710b1310d7c9a030493_2" [label="2: Exit Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19* [line 55, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{10959385173560663663|constexpr}.987a67e2a61b4710b1310d7c9a030493_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19* [line 55, column 19]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_3" -> "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_4" ;
-"#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19& [line 55, column 19]\n  n$3=_fun_Capture::Capture(n$1.__anon_field_0:Capture*,n$2.__anon_field_0:Capture&) [line 55, column 19]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{10959385173560663663|constexpr}.987a67e2a61b4710b1310d7c9a030493_3" -> "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{10959385173560663663|constexpr}.987a67e2a61b4710b1310d7c9a030493_4" ;
+"#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{10959385173560663663|constexpr}.987a67e2a61b4710b1310d7c9a030493_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Capture::capture_star_this::lambda_shared_lambda_lambda1.cpp:55:19& [line 55, column 19]\n  n$3=_fun_Capture::Capture(n$1.__anon_field_0:Capture*,n$2.__anon_field_0:Capture&) [line 55, column 19]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_4" -> "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{9456129203468966420|constexpr}.524c805f606049237b74db978143df13_2" ;
+	 "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{10959385173560663663|constexpr}.987a67e2a61b4710b1310d7c9a030493_4" -> "#lambda_shared_lambda_lambda1.cpp:55:19#capture_star_this#Capture#{10959385173560663663|constexpr}.987a67e2a61b4710b1310d7c9a030493_2" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#(91082432562742530.b72f197de8f4f60c1d815523b52f3221_1" [label="1: Start Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19::operator()\nFormals:  this:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19*\nLocals: \nCaptured:  [by ref]this:Capture* \n  " color=yellow style=filled]
 	
 
@@ -1107,21 +1107,21 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#(91082432562742530.b72f197de8f4f60c1d815523b52f3221_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#(91082432562742530.b72f197de8f4f60c1d815523b52f3221_2" ;
-"#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_1" [label="1: Start Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19::\nFormals:  this:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19* __param_0:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{1308683831640213153|constex.c6ef53d783ae1f9f2dcec6bc9c6f4c82_1" [label="1: Start Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19::\nFormals:  this:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19* __param_0:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_1" -> "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_3" ;
-"#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_2" [label="2: Exit Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{1308683831640213153|constex.c6ef53d783ae1f9f2dcec6bc9c6f4c82_1" -> "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{1308683831640213153|constex.c6ef53d783ae1f9f2dcec6bc9c6f4c82_3" ;
+"#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{1308683831640213153|constex.c6ef53d783ae1f9f2dcec6bc9c6f4c82_2" [label="2: Exit Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19* [line 61, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{1308683831640213153|constex.c6ef53d783ae1f9f2dcec6bc9c6f4c82_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19* [line 61, column 19]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_3" -> "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_4" ;
-"#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19& [line 61, column 19]\n  n$3=*n$2.__anon_field_0:Capture* [line 61, column 19]\n  *n$1.__anon_field_0:Capture*=n$3 [line 61, column 19]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{1308683831640213153|constex.c6ef53d783ae1f9f2dcec6bc9c6f4c82_3" -> "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{1308683831640213153|constex.c6ef53d783ae1f9f2dcec6bc9c6f4c82_4" ;
+"#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{1308683831640213153|constex.c6ef53d783ae1f9f2dcec6bc9c6f4c82_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Capture::capture_this_with_equal::lambda_shared_lambda_lambda1.cpp:61:19& [line 61, column 19]\n  n$3=*n$2.__anon_field_0:Capture* [line 61, column 19]\n  *n$1.__anon_field_0:Capture*=n$3 [line 61, column 19]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_4" -> "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{16013381636753347826|conste.5c764d68be3baa1f6ef1128e1dbea59f_2" ;
+	 "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{1308683831640213153|constex.c6ef53d783ae1f9f2dcec6bc9c6f4c82_4" -> "#lambda_shared_lambda_lambda1.cpp:61:19#capture_this_with_equal#Capture#{1308683831640213153|constex.c6ef53d783ae1f9f2dcec6bc9c6f4c82_2" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#(476955214552649307.449a23f73c844f26ba0d7a54aef5727e_1" [label="1: Start Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19::operator()\nFormals:  this:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19*\nLocals: \nCaptured:  [by ref]this:Capture* \n  " color=yellow style=filled]
 	
 
@@ -1137,21 +1137,21 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#(476955214552649307.449a23f73c844f26ba0d7a54aef5727e_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#(476955214552649307.449a23f73c844f26ba0d7a54aef5727e_2" ;
-"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_1" [label="1: Start Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19::\nFormals:  this:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19* __param_0:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{3159261883856682251|constexp.ae073a9427f1e0a0647a37c0a06d8723_1" [label="1: Start Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19::\nFormals:  this:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19* __param_0:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_1" -> "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_3" ;
-"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_2" [label="2: Exit Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{3159261883856682251|constexp.ae073a9427f1e0a0647a37c0a06d8723_1" -> "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{3159261883856682251|constexp.ae073a9427f1e0a0647a37c0a06d8723_3" ;
+"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{3159261883856682251|constexp.ae073a9427f1e0a0647a37c0a06d8723_2" [label="2: Exit Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19* [line 65, column 19]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{3159261883856682251|constexp.ae073a9427f1e0a0647a37c0a06d8723_3" [label="3:  Constructor Init \n   n$1=*&this:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19* [line 65, column 19]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_3" -> "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_4" ;
-"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19& [line 65, column 19]\n  n$3=*n$2.__anon_field_0:Capture* [line 65, column 19]\n  *n$1.__anon_field_0:Capture*=n$3 [line 65, column 19]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{3159261883856682251|constexp.ae073a9427f1e0a0647a37c0a06d8723_3" -> "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{3159261883856682251|constexp.ae073a9427f1e0a0647a37c0a06d8723_4" ;
+"#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{3159261883856682251|constexp.ae073a9427f1e0a0647a37c0a06d8723_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Capture::capture_this_with_auto::lambda_shared_lambda_lambda1.cpp:65:19& [line 65, column 19]\n  n$3=*n$2.__anon_field_0:Capture* [line 65, column 19]\n  *n$1.__anon_field_0:Capture*=n$3 [line 65, column 19]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_4" -> "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{10854495330849287568|constex.920289afd6e5ecdf220f6692ec06788a_2" ;
+	 "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{3159261883856682251|constexp.ae073a9427f1e0a0647a37c0a06d8723_4" -> "#lambda_shared_lambda_lambda1.cpp:65:19#capture_this_with_auto#Capture#{3159261883856682251|constexp.ae073a9427f1e0a0647a37c0a06d8723_2" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(3957024350029978205).24bdda6ed01a44c4f20e0211a02e4440_1" [label="1: Start struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::operator()\nFormals:  this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12*\nLocals: \nCaptured:  [by value]x:SomeStruct& [by value]y:SomeStruct& \n  " color=yellow style=filled]
 	
 
@@ -1167,51 +1167,51 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(3957024350029978205).24bdda6ed01a44c4f20e0211a02e4440_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(3957024350029978205).24bdda6ed01a44c4f20e0211a02e4440_2" ;
-"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_1" [label="1: Start struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::\nFormals:  this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* __param_0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_1" [label="1: Start struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::\nFormals:  this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* __param_0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_1" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_5" ;
-"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_2" [label="2: Exit struct_capture::lambda_shared_lambda_lambda1.cpp:77:12:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_1" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_5" ;
+"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_2" [label="2: Exit struct_capture::lambda_shared_lambda_lambda1.cpp:77:12:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_3" [label="3:  Constructor Init \n   n$1=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_3" [label="3:  Constructor Init \n   n$1=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_3" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_4" ;
-"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12& [line 77, column 12]\n  n$3=_fun_SomeStruct::SomeStruct(n$1.__anon_field_1:SomeStruct*,n$2.__anon_field_1:SomeStruct&) [line 77, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_3" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_4" ;
+"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12& [line 77, column 12]\n  n$3=_fun_SomeStruct::SomeStruct(n$1.__anon_field_1:SomeStruct*,n$2.__anon_field_1:SomeStruct&) [line 77, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_4" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_2" ;
-"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_5" [label="5:  Constructor Init \n   n$4=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_4" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_2" ;
+"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_5" [label="5:  Constructor Init \n   n$4=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_5" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_6" ;
-"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_6" [label="6:  Constructor Init \n   n$5=*&__param_0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12& [line 77, column 12]\n  n$6=_fun_SomeStruct::SomeStruct(n$4.__anon_field_0:SomeStruct*,n$5.__anon_field_0:SomeStruct&) [line 77, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_5" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_6" ;
+"#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_6" [label="6:  Constructor Init \n   n$5=*&__param_0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12& [line 77, column 12]\n  n$6=_fun_SomeStruct::SomeStruct(n$4.__anon_field_0:SomeStruct*,n$5.__anon_field_0:SomeStruct&) [line 77, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_6" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{11897634387038574730|constexpr}.496c30dbc77f6f3561a71876edb6137e_3" ;
-"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(138105074354565016.e6c800e9d586d901864d79972d303d01_1" [label="1: Start struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::__infer_inner_destructor_~\nFormals:  this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12*\nLocals:  \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_6" -> "#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#{4132013847919986531|constexpr}.bfb7dcac4e63864091bdca9e6fbf568a_3" ;
+"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(150665565338451364.bf6e5d23b8ee0a3b28e954ef16721938_1" [label="1: Start struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::__infer_inner_destructor_~\nFormals:  this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(138105074354565016.e6c800e9d586d901864d79972d303d01_1" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(138105074354565016.e6c800e9d586d901864d79972d303d01_3" ;
-"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(138105074354565016.e6c800e9d586d901864d79972d303d01_2" [label="2: Exit struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::__infer_inner_destructor_~ \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(150665565338451364.bf6e5d23b8ee0a3b28e954ef16721938_1" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(150665565338451364.bf6e5d23b8ee0a3b28e954ef16721938_3" ;
+"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(150665565338451364.bf6e5d23b8ee0a3b28e954ef16721938_2" [label="2: Exit struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::__infer_inner_destructor_~ \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(138105074354565016.e6c800e9d586d901864d79972d303d01_3" [label="3:  Destruction(fields) \n   n$0=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n  _=*n$0.__anon_field_1:SomeStruct [line 77, column 12]\n  n$4=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_1:SomeStruct*) injected [line 77, column 12]\n  _=*n$0.__anon_field_0:SomeStruct [line 77, column 12]\n  n$2=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_0:SomeStruct*) injected [line 77, column 12]\n " shape="box"]
+"__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(150665565338451364.bf6e5d23b8ee0a3b28e954ef16721938_3" [label="3:  Destruction(fields) \n   n$0=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n  _=*n$0.__anon_field_1:SomeStruct [line 77, column 12]\n  n$4=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_1:SomeStruct*) injected [line 77, column 12]\n  _=*n$0.__anon_field_0:SomeStruct [line 77, column 12]\n  n$2=_fun_SomeStruct::~SomeStruct(n$0.__anon_field_0:SomeStruct*) injected [line 77, column 12]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(138105074354565016.e6c800e9d586d901864d79972d303d01_3" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(138105074354565016.e6c800e9d586d901864d79972d303d01_2" ;
-"~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(13810507435456501647).7325714c5315daf013352ff960c1611b_1" [label="1: Start struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::~\nFormals:  this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(150665565338451364.bf6e5d23b8ee0a3b28e954ef16721938_3" -> "__infer_inner_destructor_~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(150665565338451364.bf6e5d23b8ee0a3b28e954ef16721938_2" ;
+"~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(15066556533845136417).c8033baa0d4e7745a33642a382a0fae1_1" [label="1: Start struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::~\nFormals:  this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(13810507435456501647).7325714c5315daf013352ff960c1611b_1" -> "~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(13810507435456501647).7325714c5315daf013352ff960c1611b_3" ;
-"~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(13810507435456501647).7325714c5315daf013352ff960c1611b_2" [label="2: Exit struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::~ \n  " color=yellow style=filled]
+	 "~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(15066556533845136417).c8033baa0d4e7745a33642a382a0fae1_1" -> "~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(15066556533845136417).c8033baa0d4e7745a33642a382a0fae1_3" ;
+"~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(15066556533845136417).c8033baa0d4e7745a33642a382a0fae1_2" [label="2: Exit struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::~ \n  " color=yellow style=filled]
 	
 
-"~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(13810507435456501647).7325714c5315daf013352ff960c1611b_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n  _=*n$0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12 [line 77, column 12]\n  n$2=_fun_struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::__infer_inner_destructor_~(n$0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12*) injected [line 77, column 12]\n " shape="box"]
+"~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(15066556533845136417).c8033baa0d4e7745a33642a382a0fae1_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12* [line 77, column 12]\n  _=*n$0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12 [line 77, column 12]\n  n$2=_fun_struct_capture::lambda_shared_lambda_lambda1.cpp:77:12::__infer_inner_destructor_~(n$0:struct_capture::lambda_shared_lambda_lambda1.cpp:77:12*) injected [line 77, column 12]\n " shape="box"]
 	
 
-	 "~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(13810507435456501647).7325714c5315daf013352ff960c1611b_3" -> "~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(13810507435456501647).7325714c5315daf013352ff960c1611b_2" ;
+	 "~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(15066556533845136417).c8033baa0d4e7745a33642a382a0fae1_3" -> "~#lambda_shared_lambda_lambda1.cpp:77:12#struct_capture#(15066556533845136417).c8033baa0d4e7745a33642a382a0fae1_2" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#(10949488819111122211).ac192604b14c602015d6f44a47207c1b_1" [label="1: Start ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12::operator()\nFormals:  this:ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12*\nLocals: \nCaptured:  [by value]xref:int \n  " color=yellow style=filled]
 	
 
@@ -1227,21 +1227,21 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#(10949488819111122211).ac192604b14c602015d6f44a47207c1b_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#(10949488819111122211).ac192604b14c602015d6f44a47207c1b_2" ;
-"#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{9636873517431573150|constexpr}.6335158802ad0302cb9055e0cf24540f_1" [label="1: Start ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12::\nFormals:  this:ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12* __param_0:ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{1565289678568005559|constexpr}.9900d24de49015a8c0e5ac605e055575_1" [label="1: Start ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12::\nFormals:  this:ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12* __param_0:ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{9636873517431573150|constexpr}.6335158802ad0302cb9055e0cf24540f_1" -> "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{9636873517431573150|constexpr}.6335158802ad0302cb9055e0cf24540f_3" ;
-"#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{9636873517431573150|constexpr}.6335158802ad0302cb9055e0cf24540f_2" [label="2: Exit ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{1565289678568005559|constexpr}.9900d24de49015a8c0e5ac605e055575_1" -> "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{1565289678568005559|constexpr}.9900d24de49015a8c0e5ac605e055575_3" ;
+"#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{1565289678568005559|constexpr}.9900d24de49015a8c0e5ac605e055575_2" [label="2: Exit ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{9636873517431573150|constexpr}.6335158802ad0302cb9055e0cf24540f_3" [label="3:  Constructor Init \n   n$1=*&this:ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12* [line 84, column 12]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{1565289678568005559|constexpr}.9900d24de49015a8c0e5ac605e055575_3" [label="3:  Constructor Init \n   n$1=*&this:ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12* [line 84, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{9636873517431573150|constexpr}.6335158802ad0302cb9055e0cf24540f_3" -> "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{9636873517431573150|constexpr}.6335158802ad0302cb9055e0cf24540f_4" ;
-"#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{9636873517431573150|constexpr}.6335158802ad0302cb9055e0cf24540f_4" [label="4:  Constructor Init \n   n$2=*&__param_0:ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12& [line 84, column 12]\n  n$3=*n$2.__anon_field_0:int [line 84, column 12]\n  *n$1.__anon_field_0:int=n$3 [line 84, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{1565289678568005559|constexpr}.9900d24de49015a8c0e5ac605e055575_3" -> "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{1565289678568005559|constexpr}.9900d24de49015a8c0e5ac605e055575_4" ;
+"#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{1565289678568005559|constexpr}.9900d24de49015a8c0e5ac605e055575_4" [label="4:  Constructor Init \n   n$2=*&__param_0:ref_capture_by_value::lambda_shared_lambda_lambda1.cpp:84:12& [line 84, column 12]\n  n$3=*n$2.__anon_field_0:int [line 84, column 12]\n  *n$1.__anon_field_0:int=n$3 [line 84, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{9636873517431573150|constexpr}.6335158802ad0302cb9055e0cf24540f_4" -> "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{9636873517431573150|constexpr}.6335158802ad0302cb9055e0cf24540f_2" ;
+	 "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{1565289678568005559|constexpr}.9900d24de49015a8c0e5ac605e055575_4" -> "#lambda_shared_lambda_lambda1.cpp:84:12#ref_capture_by_value#{1565289678568005559|constexpr}.9900d24de49015a8c0e5ac605e055575_2" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#(9014001382350406746).a424a73ac953b9703b7563c75705009f_1" [label="1: Start ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12::operator()\nFormals:  this:ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12*\nLocals: \nCaptured:  [by value]xlambda:int \n  " color=yellow style=filled]
 	
 
@@ -1257,21 +1257,21 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#(9014001382350406746).a424a73ac953b9703b7563c75705009f_4" -> "operator()#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#(9014001382350406746).a424a73ac953b9703b7563c75705009f_2" ;
-"#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{4804792769364157561|constexpr}.9f4f510fa978966a53da904e9d3ffd6b_1" [label="1: Start ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12::\nFormals:  this:ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12* __param_0:ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{1886806338377007588|constexpr}.31aacdf0058bb3a747111413ebb18733_1" [label="1: Start ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12::\nFormals:  this:ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12* __param_0:ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{4804792769364157561|constexpr}.9f4f510fa978966a53da904e9d3ffd6b_1" -> "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{4804792769364157561|constexpr}.9f4f510fa978966a53da904e9d3ffd6b_3" ;
-"#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{4804792769364157561|constexpr}.9f4f510fa978966a53da904e9d3ffd6b_2" [label="2: Exit ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{1886806338377007588|constexpr}.31aacdf0058bb3a747111413ebb18733_1" -> "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{1886806338377007588|constexpr}.31aacdf0058bb3a747111413ebb18733_3" ;
+"#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{1886806338377007588|constexpr}.31aacdf0058bb3a747111413ebb18733_2" [label="2: Exit ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12:: \n  " color=yellow style=filled]
 	
 
-"#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{4804792769364157561|constexpr}.9f4f510fa978966a53da904e9d3ffd6b_3" [label="3:  Constructor Init \n   n$1=*&this:ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12* [line 92, column 12]\n " shape="box"]
+"#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{1886806338377007588|constexpr}.31aacdf0058bb3a747111413ebb18733_3" [label="3:  Constructor Init \n   n$1=*&this:ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12* [line 92, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{4804792769364157561|constexpr}.9f4f510fa978966a53da904e9d3ffd6b_3" -> "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{4804792769364157561|constexpr}.9f4f510fa978966a53da904e9d3ffd6b_4" ;
-"#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{4804792769364157561|constexpr}.9f4f510fa978966a53da904e9d3ffd6b_4" [label="4:  Constructor Init \n   n$2=*&__param_0:ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12& [line 92, column 12]\n  n$3=*n$2.__anon_field_0:int [line 92, column 12]\n  *n$1.__anon_field_0:int=n$3 [line 92, column 12]\n " shape="box"]
+	 "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{1886806338377007588|constexpr}.31aacdf0058bb3a747111413ebb18733_3" -> "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{1886806338377007588|constexpr}.31aacdf0058bb3a747111413ebb18733_4" ;
+"#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{1886806338377007588|constexpr}.31aacdf0058bb3a747111413ebb18733_4" [label="4:  Constructor Init \n   n$2=*&__param_0:ref_init_capture_by_value::lambda_shared_lambda_lambda1.cpp:92:12& [line 92, column 12]\n  n$3=*n$2.__anon_field_0:int [line 92, column 12]\n  *n$1.__anon_field_0:int=n$3 [line 92, column 12]\n " shape="box"]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{4804792769364157561|constexpr}.9f4f510fa978966a53da904e9d3ffd6b_4" -> "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{4804792769364157561|constexpr}.9f4f510fa978966a53da904e9d3ffd6b_2" ;
+	 "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{1886806338377007588|constexpr}.31aacdf0058bb3a747111413ebb18733_4" -> "#lambda_shared_lambda_lambda1.cpp:92:12#ref_init_capture_by_value#{1886806338377007588|constexpr}.31aacdf0058bb3a747111413ebb18733_2" ;
 "operator()#lambda_shared_lambda_lambda1.cpp:9:15#bar#(7708532531154088338).ffe36bb5dd46814f3461661fb80e3e06_1" [label="1: Start bar::lambda_shared_lambda_lambda1.cpp:9:15::operator()\nFormals:  this:bar::lambda_shared_lambda_lambda1.cpp:9:15*\nLocals:  i:int \n  " color=yellow style=filled]
 	
 
@@ -1291,11 +1291,11 @@ digraph cfg {
 	
 
 	 "operator()#lambda_shared_lambda_lambda1.cpp:9:15#bar#(7708532531154088338).ffe36bb5dd46814f3461661fb80e3e06_5" -> "operator()#lambda_shared_lambda_lambda1.cpp:9:15#bar#(7708532531154088338).ffe36bb5dd46814f3461661fb80e3e06_3" ;
-"#lambda_shared_lambda_lambda1.cpp:9:15#bar#{14892892509482509619|constexpr}.5bfcda53520c9b0fd7d96e5fa8d9b7fe_1" [label="1: Start bar::lambda_shared_lambda_lambda1.cpp:9:15::\nFormals:  this:bar::lambda_shared_lambda_lambda1.cpp:9:15* __param_0:bar::lambda_shared_lambda_lambda1.cpp:9:15&\nLocals:  \n  " color=yellow style=filled]
+"#lambda_shared_lambda_lambda1.cpp:9:15#bar#{4587322379423162330|constexpr}.1cabad0b052f86af4ca6109c2d9eac45_1" [label="1: Start bar::lambda_shared_lambda_lambda1.cpp:9:15::\nFormals:  this:bar::lambda_shared_lambda_lambda1.cpp:9:15* __param_0:bar::lambda_shared_lambda_lambda1.cpp:9:15&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#lambda_shared_lambda_lambda1.cpp:9:15#bar#{14892892509482509619|constexpr}.5bfcda53520c9b0fd7d96e5fa8d9b7fe_1" -> "#lambda_shared_lambda_lambda1.cpp:9:15#bar#{14892892509482509619|constexpr}.5bfcda53520c9b0fd7d96e5fa8d9b7fe_2" ;
-"#lambda_shared_lambda_lambda1.cpp:9:15#bar#{14892892509482509619|constexpr}.5bfcda53520c9b0fd7d96e5fa8d9b7fe_2" [label="2: Exit bar::lambda_shared_lambda_lambda1.cpp:9:15:: \n  " color=yellow style=filled]
+	 "#lambda_shared_lambda_lambda1.cpp:9:15#bar#{4587322379423162330|constexpr}.1cabad0b052f86af4ca6109c2d9eac45_1" -> "#lambda_shared_lambda_lambda1.cpp:9:15#bar#{4587322379423162330|constexpr}.1cabad0b052f86af4ca6109c2d9eac45_2" ;
+"#lambda_shared_lambda_lambda1.cpp:9:15#bar#{4587322379423162330|constexpr}.1cabad0b052f86af4ca6109c2d9eac45_2" [label="2: Exit bar::lambda_shared_lambda_lambda1.cpp:9:15:: \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot
index 9059e6f31..c2cc296b3 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot
@@ -78,11 +78,11 @@ digraph cfg {
 "forward<int>#std#5548362574050729124.664bf3a19e8401f31df778b67554bdae_2" [label="2: Exit std::forward<int> \n  " color=yellow style=filled]
 	
 
-"forward<int>#std#5548362574050729124.664bf3a19e8401f31df778b67554bdae_3" [label="3:  Return Stmt \n   n$0=*&__t:int& [line 2269, column 31]\n " shape="box"]
+"forward<int>#std#5548362574050729124.664bf3a19e8401f31df778b67554bdae_3" [label="3:  Return Stmt \n   n$0=*&__t:int& [line 2629, column 31]\n " shape="box"]
 	
 
 	 "forward<int>#std#5548362574050729124.664bf3a19e8401f31df778b67554bdae_3" -> "forward<int>#std#5548362574050729124.664bf3a19e8401f31df778b67554bdae_4" ;
-"forward<int>#std#5548362574050729124.664bf3a19e8401f31df778b67554bdae_4" [label="4:  Return Stmt \n   *&return:int&=n$0 [line 2269, column 5]\n " shape="box"]
+"forward<int>#std#5548362574050729124.664bf3a19e8401f31df778b67554bdae_4" [label="4:  Return Stmt \n   *&return:int&=n$0 [line 2629, column 5]\n " shape="box"]
 	
 
 	 "forward<int>#std#5548362574050729124.664bf3a19e8401f31df778b67554bdae_4" -> "forward<int>#std#5548362574050729124.664bf3a19e8401f31df778b67554bdae_2" ;
@@ -93,11 +93,11 @@ digraph cfg {
 "forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_2" [label="2: Exit std::forward<int_&> \n  " color=yellow style=filled]
 	
 
-"forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_3" [label="3:  Return Stmt \n   n$0=*&__t:int& [line 2269, column 31]\n " shape="box"]
+"forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_3" [label="3:  Return Stmt \n   n$0=*&__t:int& [line 2629, column 31]\n " shape="box"]
 	
 
 	 "forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_3" -> "forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_4" ;
-"forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_4" [label="4:  Return Stmt \n   *&return:int&=n$0 [line 2269, column 5]\n " shape="box"]
+"forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_4" [label="4:  Return Stmt \n   *&return:int&=n$0 [line 2629, column 5]\n " shape="box"]
 	
 
 	 "forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_4" -> "forward<int_&>#std#2714018779968350623.5a6c534312c02b38db42a98e7dfe7983_2" ;
@@ -253,41 +253,41 @@ digraph cfg {
 	
 
 	 "type_alias_by_val#pass_by_val#9273827923998572097.425db1bd7e6b48116fa99ed40b0b6415_4" -> "type_alias_by_val#pass_by_val#9273827923998572097.425db1bd7e6b48116fa99ed40b0b6415_2" ;
-"Id#Id<int>#pass_by_val#{3384099991783983184}.e286af060b6cead08a43f9654ad715c7_1" [label="1: Start pass_by_val::Id<int>::Id\nFormals:  this:pass_by_val::Id<int>* __param_0:int __param_1:int& __param_2:int&\nLocals:  \n  " color=yellow style=filled]
+"Id#Id<int>#pass_by_val#{11559311172078128305}.9f0baee348d3d73a31c6908db492fb18_1" [label="1: Start pass_by_val::Id<int>::Id\nFormals:  this:pass_by_val::Id<int>* __param_0:int __param_1:int& __param_2:int&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Id#Id<int>#pass_by_val#{3384099991783983184}.e286af060b6cead08a43f9654ad715c7_1" -> "Id#Id<int>#pass_by_val#{3384099991783983184}.e286af060b6cead08a43f9654ad715c7_2" ;
-"Id#Id<int>#pass_by_val#{3384099991783983184}.e286af060b6cead08a43f9654ad715c7_2" [label="2: Exit pass_by_val::Id<int>::Id \n  " color=yellow style=filled]
+	 "Id#Id<int>#pass_by_val#{11559311172078128305}.9f0baee348d3d73a31c6908db492fb18_1" -> "Id#Id<int>#pass_by_val#{11559311172078128305}.9f0baee348d3d73a31c6908db492fb18_2" ;
+"Id#Id<int>#pass_by_val#{11559311172078128305}.9f0baee348d3d73a31c6908db492fb18_2" [label="2: Exit pass_by_val::Id<int>::Id \n  " color=yellow style=filled]
 	
 
-"Id#Id<int>#pass_by_val#{7679130497746934716|constexpr}.ec7ae8f1f59ff02018973f2770719ebf_1" [label="1: Start pass_by_val::Id<int>::Id\nFormals:  this:pass_by_val::Id<int>* __param_0:pass_by_val::Id<int>&\nLocals:  \n  " color=yellow style=filled]
+"Id#Id<int>#pass_by_val#{13905763975816786831|constexpr}.b27e3d01dbcc52e900b215f919a00f8a_1" [label="1: Start pass_by_val::Id<int>::Id\nFormals:  this:pass_by_val::Id<int>* __param_0:pass_by_val::Id<int>&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Id#Id<int>#pass_by_val#{7679130497746934716|constexpr}.ec7ae8f1f59ff02018973f2770719ebf_1" -> "Id#Id<int>#pass_by_val#{7679130497746934716|constexpr}.ec7ae8f1f59ff02018973f2770719ebf_2" ;
-"Id#Id<int>#pass_by_val#{7679130497746934716|constexpr}.ec7ae8f1f59ff02018973f2770719ebf_2" [label="2: Exit pass_by_val::Id<int>::Id \n  " color=yellow style=filled]
+	 "Id#Id<int>#pass_by_val#{13905763975816786831|constexpr}.b27e3d01dbcc52e900b215f919a00f8a_1" -> "Id#Id<int>#pass_by_val#{13905763975816786831|constexpr}.b27e3d01dbcc52e900b215f919a00f8a_2" ;
+"Id#Id<int>#pass_by_val#{13905763975816786831|constexpr}.b27e3d01dbcc52e900b215f919a00f8a_2" [label="2: Exit pass_by_val::Id<int>::Id \n  " color=yellow style=filled]
 	
 
-"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_1" [label="1: Start pass_by_val::PlainStruct::PlainStruct\nFormals:  this:pass_by_val::PlainStruct* __param_0:pass_by_val::PlainStruct const &\nLocals:  \n  " color=yellow style=filled]
+"PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_1" [label="1: Start pass_by_val::PlainStruct::PlainStruct\nFormals:  this:pass_by_val::PlainStruct* __param_0:pass_by_val::PlainStruct const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_1" -> "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_5" ;
-"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_2" [label="2: Exit pass_by_val::PlainStruct::PlainStruct \n  " color=yellow style=filled]
+	 "PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_1" -> "PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_5" ;
+"PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_2" [label="2: Exit pass_by_val::PlainStruct::PlainStruct \n  " color=yellow style=filled]
 	
 
-"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_3" [label="3:  Constructor Init \n   n$1=*&this:pass_by_val::PlainStruct* [line 11, column 8]\n " shape="box"]
+"PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_3" [label="3:  Constructor Init \n   n$1=*&this:pass_by_val::PlainStruct* [line 11, column 8]\n " shape="box"]
 	
 
-	 "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_3" -> "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_4" ;
-"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_4" [label="4:  Constructor Init \n   n$2=*&__param_0:pass_by_val::PlainStruct const & [line 11, column 8]\n  n$3=*n$2.y:int* [line 11, column 8]\n  *n$1.y:int*=n$3 [line 11, column 8]\n " shape="box"]
+	 "PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_3" -> "PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_4" ;
+"PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_4" [label="4:  Constructor Init \n   n$2=*&__param_0:pass_by_val::PlainStruct const & [line 11, column 8]\n  n$3=*n$2.y:int* [line 11, column 8]\n  *n$1.y:int*=n$3 [line 11, column 8]\n " shape="box"]
 	
 
-	 "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_4" -> "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_2" ;
-"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_5" [label="5:  Constructor Init \n   n$4=*&this:pass_by_val::PlainStruct* [line 11, column 8]\n " shape="box"]
+	 "PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_4" -> "PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_2" ;
+"PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_5" [label="5:  Constructor Init \n   n$4=*&this:pass_by_val::PlainStruct* [line 11, column 8]\n " shape="box"]
 	
 
-	 "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_5" -> "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_6" ;
-"PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_6" [label="6:  Constructor Init \n   n$5=*&__param_0:pass_by_val::PlainStruct const & [line 11, column 8]\n  n$6=*n$5.x:int [line 11, column 8]\n  *n$4.x:int=n$6 [line 11, column 8]\n " shape="box"]
+	 "PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_5" -> "PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_6" ;
+"PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_6" [label="6:  Constructor Init \n   n$5=*&__param_0:pass_by_val::PlainStruct const & [line 11, column 8]\n  n$6=*n$5.x:int [line 11, column 8]\n  *n$4.x:int=n$6 [line 11, column 8]\n " shape="box"]
 	
 
-	 "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_6" -> "PlainStruct#PlainStruct#pass_by_val#{2553093086388184854|constexpr}.e295b1e7e1c5b638011ce60f4cd77a28_3" ;
+	 "PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_6" -> "PlainStruct#PlainStruct#pass_by_val#{4394507928576298991|constexpr}.ebcae5a04f81a0a5689a596c5bf2acec_3" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/conversion_operator.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/conversion_operator.cpp.dot
index 8b003625e..0c7300460 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/conversion_operator.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/methods/conversion_operator.cpp.dot
@@ -274,36 +274,36 @@ digraph cfg {
 	
 
 	 "operator_bool#X#conversion_operator#(8462049473072140514).68eca81e12b5c1864b348d6f60158ae6_4" -> "operator_bool#X#conversion_operator#(8462049473072140514).68eca81e12b5c1864b348d6f60158ae6_2" ;
-"X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_1" [label="1: Start conversion_operator::X::X\nFormals:  this:conversion_operator::X* x:conversion_operator::X const &\nLocals:  \n  " color=yellow style=filled]
+"X#X#conversion_operator#{18213627293247051295}.eec4ba0ec97d882388bd3f251237e693_1" [label="1: Start conversion_operator::X::X\nFormals:  this:conversion_operator::X* f:int b:_Bool\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_1" -> "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_4" ;
-"X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_2" [label="2: Exit conversion_operator::X::X \n  " color=yellow style=filled]
+	 "X#X#conversion_operator#{18213627293247051295}.eec4ba0ec97d882388bd3f251237e693_1" -> "X#X#conversion_operator#{18213627293247051295}.eec4ba0ec97d882388bd3f251237e693_4" ;
+"X#X#conversion_operator#{18213627293247051295}.eec4ba0ec97d882388bd3f251237e693_2" [label="2: Exit conversion_operator::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:conversion_operator::X* [line 21, column 5]\n  n$1=*&x:conversion_operator::X const & [line 21, column 10]\n  n$2=*n$1.b_:_Bool [line 21, column 10]\n  *n$0.b_:_Bool=n$2 [line 21, column 5]\n " shape="box"]
+"X#X#conversion_operator#{18213627293247051295}.eec4ba0ec97d882388bd3f251237e693_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:conversion_operator::X* [line 17, column 5]\n  n$1=*&b:_Bool [line 17, column 10]\n  *n$0.b_:_Bool=n$1 [line 17, column 5]\n " shape="box"]
 	
 
-	 "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_3" -> "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_2" ;
-"X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&this:conversion_operator::X* [line 20, column 5]\n  n$4=*&x:conversion_operator::X const & [line 20, column 10]\n  n$5=*n$4.f_:int [line 20, column 10]\n  *n$3.f_:int=n$5 [line 20, column 5]\n " shape="box"]
+	 "X#X#conversion_operator#{18213627293247051295}.eec4ba0ec97d882388bd3f251237e693_3" -> "X#X#conversion_operator#{18213627293247051295}.eec4ba0ec97d882388bd3f251237e693_2" ;
+"X#X#conversion_operator#{18213627293247051295}.eec4ba0ec97d882388bd3f251237e693_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:conversion_operator::X* [line 16, column 5]\n  n$3=*&f:int [line 16, column 10]\n  *n$2.f_:int=n$3 [line 16, column 5]\n " shape="box"]
 	
 
-	 "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_4" -> "X#X#conversion_operator#{10042806963993343440}.3443e3517905e53c0b3c27c57963d3c9_3" ;
-"X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_1" [label="1: Start conversion_operator::X::X\nFormals:  this:conversion_operator::X* f:int b:_Bool\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#conversion_operator#{18213627293247051295}.eec4ba0ec97d882388bd3f251237e693_4" -> "X#X#conversion_operator#{18213627293247051295}.eec4ba0ec97d882388bd3f251237e693_3" ;
+"X#X#conversion_operator#{844163979429861861}.c5bff0e0033a2bb2d79ebfee47dc04d5_1" [label="1: Start conversion_operator::X::X\nFormals:  this:conversion_operator::X* x:conversion_operator::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_1" -> "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_4" ;
-"X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_2" [label="2: Exit conversion_operator::X::X \n  " color=yellow style=filled]
+	 "X#X#conversion_operator#{844163979429861861}.c5bff0e0033a2bb2d79ebfee47dc04d5_1" -> "X#X#conversion_operator#{844163979429861861}.c5bff0e0033a2bb2d79ebfee47dc04d5_4" ;
+"X#X#conversion_operator#{844163979429861861}.c5bff0e0033a2bb2d79ebfee47dc04d5_2" [label="2: Exit conversion_operator::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:conversion_operator::X* [line 17, column 5]\n  n$1=*&b:_Bool [line 17, column 10]\n  *n$0.b_:_Bool=n$1 [line 17, column 5]\n " shape="box"]
+"X#X#conversion_operator#{844163979429861861}.c5bff0e0033a2bb2d79ebfee47dc04d5_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:conversion_operator::X* [line 21, column 5]\n  n$1=*&x:conversion_operator::X const & [line 21, column 10]\n  n$2=*n$1.b_:_Bool [line 21, column 10]\n  *n$0.b_:_Bool=n$2 [line 21, column 5]\n " shape="box"]
 	
 
-	 "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_3" -> "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_2" ;
-"X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_4" [label="4:  BinaryOperatorStmt: Assign \n   n$2=*&this:conversion_operator::X* [line 16, column 5]\n  n$3=*&f:int [line 16, column 10]\n  *n$2.f_:int=n$3 [line 16, column 5]\n " shape="box"]
+	 "X#X#conversion_operator#{844163979429861861}.c5bff0e0033a2bb2d79ebfee47dc04d5_3" -> "X#X#conversion_operator#{844163979429861861}.c5bff0e0033a2bb2d79ebfee47dc04d5_2" ;
+"X#X#conversion_operator#{844163979429861861}.c5bff0e0033a2bb2d79ebfee47dc04d5_4" [label="4:  BinaryOperatorStmt: Assign \n   n$3=*&this:conversion_operator::X* [line 20, column 5]\n  n$4=*&x:conversion_operator::X const & [line 20, column 10]\n  n$5=*n$4.f_:int [line 20, column 10]\n  *n$3.f_:int=n$5 [line 20, column 5]\n " shape="box"]
 	
 
-	 "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_4" -> "X#X#conversion_operator#{3369558305026158368}.bef059c92c6377f62516e101c1177cad_3" ;
+	 "X#X#conversion_operator#{844163979429861861}.c5bff0e0033a2bb2d79ebfee47dc04d5_4" -> "X#X#conversion_operator#{844163979429861861}.c5bff0e0033a2bb2d79ebfee47dc04d5_3" ;
 "operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_1" [label="1: Start conversion_operator::Y::operator_X\nFormals:  this:conversion_operator::Y* __return_param:conversion_operator::X*\nLocals:  0$?%__sil_tmpSIL_materialize_temp__n$1:conversion_operator::X const  \n  " color=yellow style=filled]
 	
 
@@ -327,11 +327,11 @@ digraph cfg {
 	
 
 	 "operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_6" -> "operator_X#Y#conversion_operator(class conversion_operator::X)#(9875474444891926125).86894a9a1bdbf53dc3721d092420d60c_2" ;
-"Y#Y#conversion_operator#{2209317117193064868}.b5b04122b8822499b024fd96b2c79e26_1" [label="1: Start conversion_operator::Y::Y\nFormals:  this:conversion_operator::Y*\nLocals:  \n  " color=yellow style=filled]
+"Y#Y#conversion_operator#{2705305713028149157}.a6ddb8276d8b9ac7112fbcc397fa6549_1" [label="1: Start conversion_operator::Y::Y\nFormals:  this:conversion_operator::Y*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#conversion_operator#{2209317117193064868}.b5b04122b8822499b024fd96b2c79e26_1" -> "Y#Y#conversion_operator#{2209317117193064868}.b5b04122b8822499b024fd96b2c79e26_2" ;
-"Y#Y#conversion_operator#{2209317117193064868}.b5b04122b8822499b024fd96b2c79e26_2" [label="2: Exit conversion_operator::Y::Y \n  " color=yellow style=filled]
+	 "Y#Y#conversion_operator#{2705305713028149157}.a6ddb8276d8b9ac7112fbcc397fa6549_1" -> "Y#Y#conversion_operator#{2705305713028149157}.a6ddb8276d8b9ac7112fbcc397fa6549_2" ;
+"Y#Y#conversion_operator#{2705305713028149157}.a6ddb8276d8b9ac7112fbcc397fa6549_2" [label="2: Exit conversion_operator::Y::Y \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/return_struct.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/return_struct.cpp.dot
index 5b44680df..8b4ee658d 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/return_struct.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/methods/return_struct.cpp.dot
@@ -50,26 +50,26 @@ digraph cfg {
 	
 
 	 "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_6" -> "get#A(class X)#(1761444600576643509).0f83d3543d984a8645cb78162580d93f_3" ;
-"X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_1" [label="1: Start X::X\nFormals:  this:X* __param_0:X&\nLocals:  \n  " color=yellow style=filled]
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_1" [label="1: Start X::X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_1" -> "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_3" ;
-"X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_2" [label="2: Exit X::X \n  " color=yellow style=filled]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_1" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_2" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_2" [label="2: Exit X::X \n  " color=yellow style=filled]
 	
 
-"X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_3" [label="3:  Constructor Init \n   n$1=*&this:X* [line 8, column 8]\n " shape="box"]
+"X#X#{7542825376858911664|constexpr}.125b086f5f25f1ed62f4c0beac82269c_1" [label="1: Start X::X\nFormals:  this:X* __param_0:X&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_3" -> "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_4" ;
-"X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_4" [label="4:  Constructor Init \n   n$2=*&__param_0:X& [line 8, column 8]\n  n$3=*n$2.f:int [line 8, column 8]\n  *n$1.f:int=n$3 [line 8, column 8]\n " shape="box"]
+	 "X#X#{7542825376858911664|constexpr}.125b086f5f25f1ed62f4c0beac82269c_1" -> "X#X#{7542825376858911664|constexpr}.125b086f5f25f1ed62f4c0beac82269c_3" ;
+"X#X#{7542825376858911664|constexpr}.125b086f5f25f1ed62f4c0beac82269c_2" [label="2: Exit X::X \n  " color=yellow style=filled]
 	
 
-	 "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_4" -> "X#X#{4662457305382278389|constexpr}.7a0af4be288b205dc1c04f6801938150_2" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_1" [label="1: Start X::X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#{7542825376858911664|constexpr}.125b086f5f25f1ed62f4c0beac82269c_3" [label="3:  Constructor Init \n   n$1=*&this:X* [line 8, column 8]\n " shape="box"]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_1" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" [label="2: Exit X::X \n  " color=yellow style=filled]
+	 "X#X#{7542825376858911664|constexpr}.125b086f5f25f1ed62f4c0beac82269c_3" -> "X#X#{7542825376858911664|constexpr}.125b086f5f25f1ed62f4c0beac82269c_4" ;
+"X#X#{7542825376858911664|constexpr}.125b086f5f25f1ed62f4c0beac82269c_4" [label="4:  Constructor Init \n   n$2=*&__param_0:X& [line 8, column 8]\n  n$3=*n$2.f:int [line 8, column 8]\n  *n$1.f:int=n$3 [line 8, column 8]\n " shape="box"]
 	
 
+	 "X#X#{7542825376858911664|constexpr}.125b086f5f25f1ed62f4c0beac82269c_4" -> "X#X#{7542825376858911664|constexpr}.125b086f5f25f1ed62f4c0beac82269c_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/virtual_methods.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/virtual_methods.cpp.dot
index f0e3b0dcb..acb730aeb 100644
--- a/infer/tests/codetoanalyze/cpp/shared/methods/virtual_methods.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/methods/virtual_methods.cpp.dot
@@ -165,11 +165,11 @@ digraph cfg {
 	
 
 	 "set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_4" -> "set_values#Polygon#(2698446688876490094).f9216ba6d3085c8bce59aeddec27f348_3" ;
-"Polygon#Polygon#{10850889526924573388}.39fcc5831c0234f5743317d6969628c2_1" [label="1: Start Polygon::Polygon\nFormals:  this:Polygon*\nLocals:  \n  " color=yellow style=filled]
+"Polygon#Polygon#{11469354922025116589}.8fcae27003a8dcdfbaecf915d438331a_1" [label="1: Start Polygon::Polygon\nFormals:  this:Polygon*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Polygon#Polygon#{10850889526924573388}.39fcc5831c0234f5743317d6969628c2_1" -> "Polygon#Polygon#{10850889526924573388}.39fcc5831c0234f5743317d6969628c2_2" ;
-"Polygon#Polygon#{10850889526924573388}.39fcc5831c0234f5743317d6969628c2_2" [label="2: Exit Polygon::Polygon \n  " color=yellow style=filled]
+	 "Polygon#Polygon#{11469354922025116589}.8fcae27003a8dcdfbaecf915d438331a_1" -> "Polygon#Polygon#{11469354922025116589}.8fcae27003a8dcdfbaecf915d438331a_2" ;
+"Polygon#Polygon#{11469354922025116589}.8fcae27003a8dcdfbaecf915d438331a_2" [label="2: Exit Polygon::Polygon \n  " color=yellow style=filled]
 	
 
 "area#Rectangle#(14534668876010564879).9b17971eaa6024f5a21d98d4b495fbd8_1" [label="1: Start Rectangle::area\nFormals:  this:Rectangle*\nLocals:  \n  " color=yellow style=filled]
@@ -187,21 +187,21 @@ digraph cfg {
 	
 
 	 "area#Rectangle#(14534668876010564879).9b17971eaa6024f5a21d98d4b495fbd8_4" -> "area#Rectangle#(14534668876010564879).9b17971eaa6024f5a21d98d4b495fbd8_2" ;
-"Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_1" [label="1: Start Rectangle::Rectangle\nFormals:  this:Rectangle*\nLocals:  \n  " color=yellow style=filled]
+"Rectangle#Rectangle#{37770367790745680}.b489689f1ea2a6c0031f1c12df9cf683_1" [label="1: Start Rectangle::Rectangle\nFormals:  this:Rectangle*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_1" -> "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_3" ;
-"Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_2" [label="2: Exit Rectangle::Rectangle \n  " color=yellow style=filled]
+	 "Rectangle#Rectangle#{37770367790745680}.b489689f1ea2a6c0031f1c12df9cf683_1" -> "Rectangle#Rectangle#{37770367790745680}.b489689f1ea2a6c0031f1c12df9cf683_3" ;
+"Rectangle#Rectangle#{37770367790745680}.b489689f1ea2a6c0031f1c12df9cf683_2" [label="2: Exit Rectangle::Rectangle \n  " color=yellow style=filled]
 	
 
-"Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_3" [label="3:  Constructor Init \n   n$1=*&this:Rectangle* [line 21, column 7]\n " shape="box"]
+"Rectangle#Rectangle#{37770367790745680}.b489689f1ea2a6c0031f1c12df9cf683_3" [label="3:  Constructor Init \n   n$1=*&this:Rectangle* [line 21, column 7]\n " shape="box"]
 	
 
-	 "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_3" -> "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_4" ;
-"Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_4" [label="4:  Constructor Init \n   n$2=_fun_Polygon::Polygon(n$1:Rectangle*) [line 21, column 7]\n " shape="box"]
+	 "Rectangle#Rectangle#{37770367790745680}.b489689f1ea2a6c0031f1c12df9cf683_3" -> "Rectangle#Rectangle#{37770367790745680}.b489689f1ea2a6c0031f1c12df9cf683_4" ;
+"Rectangle#Rectangle#{37770367790745680}.b489689f1ea2a6c0031f1c12df9cf683_4" [label="4:  Constructor Init \n   n$2=_fun_Polygon::Polygon(n$1:Rectangle*) [line 21, column 7]\n " shape="box"]
 	
 
-	 "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_4" -> "Rectangle#Rectangle#{548993796743293985}.386f89cceb4c14e4fc014bcc1ec86f4b_2" ;
+	 "Rectangle#Rectangle#{37770367790745680}.b489689f1ea2a6c0031f1c12df9cf683_4" -> "Rectangle#Rectangle#{37770367790745680}.b489689f1ea2a6c0031f1c12df9cf683_2" ;
 "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_1" [label="1: Start Triangle::area\nFormals:  this:Triangle*\nLocals:  x:int \n  " color=yellow style=filled]
 	
 
@@ -221,41 +221,41 @@ digraph cfg {
 	
 
 	 "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_5" -> "area#Triangle#(14534668876010564879).b2c96bbb8f170e9d12180637dc0d6da3_3" ;
-"Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_1" [label="1: Start Triangle::Triangle\nFormals:  this:Triangle*\nLocals:  \n  " color=yellow style=filled]
+"Triangle#Triangle#{14925008984920285500}.e64c12e70a0a920bac962a31dd016f62_1" [label="1: Start Triangle::Triangle\nFormals:  this:Triangle*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_1" -> "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_3" ;
-"Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_2" [label="2: Exit Triangle::Triangle \n  " color=yellow style=filled]
+	 "Triangle#Triangle#{14925008984920285500}.e64c12e70a0a920bac962a31dd016f62_1" -> "Triangle#Triangle#{14925008984920285500}.e64c12e70a0a920bac962a31dd016f62_3" ;
+"Triangle#Triangle#{14925008984920285500}.e64c12e70a0a920bac962a31dd016f62_2" [label="2: Exit Triangle::Triangle \n  " color=yellow style=filled]
 	
 
-"Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_3" [label="3:  Constructor Init \n   n$1=*&this:Triangle* [line 27, column 7]\n " shape="box"]
+"Triangle#Triangle#{14925008984920285500}.e64c12e70a0a920bac962a31dd016f62_3" [label="3:  Constructor Init \n   n$1=*&this:Triangle* [line 27, column 7]\n " shape="box"]
 	
 
-	 "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_3" -> "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_4" ;
-"Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_4" [label="4:  Constructor Init \n   n$2=_fun_Polygon::Polygon(n$1:Triangle*) [line 27, column 7]\n " shape="box"]
+	 "Triangle#Triangle#{14925008984920285500}.e64c12e70a0a920bac962a31dd016f62_3" -> "Triangle#Triangle#{14925008984920285500}.e64c12e70a0a920bac962a31dd016f62_4" ;
+"Triangle#Triangle#{14925008984920285500}.e64c12e70a0a920bac962a31dd016f62_4" [label="4:  Constructor Init \n   n$2=_fun_Polygon::Polygon(n$1:Triangle*) [line 27, column 7]\n " shape="box"]
 	
 
-	 "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_4" -> "Triangle#Triangle#{15421032765127472541}.26bfd28d102273793a62fe013a50a7d1_2" ;
-"__infer_inner_destructor_~Triangle#Triangle#(14073216405110724792).c04c3fa3cd50a3125c149616f3af0105_1" [label="1: Start Triangle::__infer_inner_destructor_~Triangle\nFormals:  this:Triangle*\nLocals:  \n  " color=yellow style=filled]
+	 "Triangle#Triangle#{14925008984920285500}.e64c12e70a0a920bac962a31dd016f62_4" -> "Triangle#Triangle#{14925008984920285500}.e64c12e70a0a920bac962a31dd016f62_2" ;
+"__infer_inner_destructor_~Triangle#Triangle#(15321349019777754162).beef4fb98598050797ff216b414c1577_1" [label="1: Start Triangle::__infer_inner_destructor_~Triangle\nFormals:  this:Triangle*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "__infer_inner_destructor_~Triangle#Triangle#(14073216405110724792).c04c3fa3cd50a3125c149616f3af0105_1" -> "__infer_inner_destructor_~Triangle#Triangle#(14073216405110724792).c04c3fa3cd50a3125c149616f3af0105_3" ;
-"__infer_inner_destructor_~Triangle#Triangle#(14073216405110724792).c04c3fa3cd50a3125c149616f3af0105_2" [label="2: Exit Triangle::__infer_inner_destructor_~Triangle \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~Triangle#Triangle#(15321349019777754162).beef4fb98598050797ff216b414c1577_1" -> "__infer_inner_destructor_~Triangle#Triangle#(15321349019777754162).beef4fb98598050797ff216b414c1577_3" ;
+"__infer_inner_destructor_~Triangle#Triangle#(15321349019777754162).beef4fb98598050797ff216b414c1577_2" [label="2: Exit Triangle::__infer_inner_destructor_~Triangle \n  " color=yellow style=filled]
 	
 
-"__infer_inner_destructor_~Triangle#Triangle#(14073216405110724792).c04c3fa3cd50a3125c149616f3af0105_3" [label="3:  Destruction(fields) \n   n$0=*&this:Triangle* [line 29, column 15]\n  _=*n$0:Triangle [line 29, column 15]\n  n$2=_fun_Polygon::__infer_inner_destructor_~Polygon(n$0:Triangle*) injected virtual [line 29, column 15]\n " shape="box"]
+"__infer_inner_destructor_~Triangle#Triangle#(15321349019777754162).beef4fb98598050797ff216b414c1577_3" [label="3:  Destruction(fields) \n   n$0=*&this:Triangle* [line 29, column 15]\n  _=*n$0:Triangle [line 29, column 15]\n  n$2=_fun_Polygon::__infer_inner_destructor_~Polygon(n$0:Triangle*) injected virtual [line 29, column 15]\n " shape="box"]
 	
 
-	 "__infer_inner_destructor_~Triangle#Triangle#(14073216405110724792).c04c3fa3cd50a3125c149616f3af0105_3" -> "__infer_inner_destructor_~Triangle#Triangle#(14073216405110724792).c04c3fa3cd50a3125c149616f3af0105_2" ;
-"~Triangle#Triangle#(14073216405110724792).8adff4889e6d988a35e49531a9afaad5_1" [label="1: Start Triangle::~Triangle\nFormals:  this:Triangle*\nLocals:  \n  " color=yellow style=filled]
+	 "__infer_inner_destructor_~Triangle#Triangle#(15321349019777754162).beef4fb98598050797ff216b414c1577_3" -> "__infer_inner_destructor_~Triangle#Triangle#(15321349019777754162).beef4fb98598050797ff216b414c1577_2" ;
+"~Triangle#Triangle#(15321349019777754162).1c72e28229f327d097695ed4746edcfe_1" [label="1: Start Triangle::~Triangle\nFormals:  this:Triangle*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "~Triangle#Triangle#(14073216405110724792).8adff4889e6d988a35e49531a9afaad5_1" -> "~Triangle#Triangle#(14073216405110724792).8adff4889e6d988a35e49531a9afaad5_3" ;
-"~Triangle#Triangle#(14073216405110724792).8adff4889e6d988a35e49531a9afaad5_2" [label="2: Exit Triangle::~Triangle \n  " color=yellow style=filled]
+	 "~Triangle#Triangle#(15321349019777754162).1c72e28229f327d097695ed4746edcfe_1" -> "~Triangle#Triangle#(15321349019777754162).1c72e28229f327d097695ed4746edcfe_3" ;
+"~Triangle#Triangle#(15321349019777754162).1c72e28229f327d097695ed4746edcfe_2" [label="2: Exit Triangle::~Triangle \n  " color=yellow style=filled]
 	
 
-"~Triangle#Triangle#(14073216405110724792).8adff4889e6d988a35e49531a9afaad5_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:Triangle* [line 29, column 15]\n  _=*n$0:Triangle [line 29, column 15]\n  n$2=_fun_Triangle::__infer_inner_destructor_~Triangle(n$0:Triangle*) injected virtual [line 29, column 15]\n " shape="box"]
+"~Triangle#Triangle#(15321349019777754162).1c72e28229f327d097695ed4746edcfe_3" [label="3:  Destruction(virtual base) \n   n$0=*&this:Triangle* [line 29, column 15]\n  _=*n$0:Triangle [line 29, column 15]\n  n$2=_fun_Triangle::__infer_inner_destructor_~Triangle(n$0:Triangle*) injected virtual [line 29, column 15]\n " shape="box"]
 	
 
-	 "~Triangle#Triangle#(14073216405110724792).8adff4889e6d988a35e49531a9afaad5_3" -> "~Triangle#Triangle#(14073216405110724792).8adff4889e6d988a35e49531a9afaad5_2" ;
+	 "~Triangle#Triangle#(15321349019777754162).1c72e28229f327d097695ed4746edcfe_3" -> "~Triangle#Triangle#(15321349019777754162).1c72e28229f327d097695ed4746edcfe_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/namespace/namespace.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/namespace/namespace.cpp.dot
index 7712fc5cc..3c1a18829 100644
--- a/infer/tests/codetoanalyze/cpp/shared/namespace/namespace.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/namespace/namespace.cpp.dot
@@ -95,25 +95,25 @@ digraph cfg {
 	
 
 	 "value#foo#118977410660901546.9623db3632a56e3cb17951602d147a29_3" -> "value#foo#118977410660901546.9623db3632a56e3cb17951602d147a29_2" ;
-"Rectangle#Rectangle#bar#{16076319501091404979}.cb85c0acc359c05c70c9c64fe7f882ea_1" [label="1: Start bar::Rectangle::Rectangle\nFormals:  this:bar::Rectangle*\nLocals:  \n  " color=yellow style=filled]
+"Rectangle#Rectangle#bar#{18069594444543445582}.883c7d8d590bc4cfe77875caba8a1ba0_1" [label="1: Start bar::Rectangle::Rectangle\nFormals:  this:bar::Rectangle*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Rectangle#Rectangle#bar#{16076319501091404979}.cb85c0acc359c05c70c9c64fe7f882ea_1" -> "Rectangle#Rectangle#bar#{16076319501091404979}.cb85c0acc359c05c70c9c64fe7f882ea_2" ;
-"Rectangle#Rectangle#bar#{16076319501091404979}.cb85c0acc359c05c70c9c64fe7f882ea_2" [label="2: Exit bar::Rectangle::Rectangle \n  " color=yellow style=filled]
+	 "Rectangle#Rectangle#bar#{18069594444543445582}.883c7d8d590bc4cfe77875caba8a1ba0_1" -> "Rectangle#Rectangle#bar#{18069594444543445582}.883c7d8d590bc4cfe77875caba8a1ba0_2" ;
+"Rectangle#Rectangle#bar#{18069594444543445582}.883c7d8d590bc4cfe77875caba8a1ba0_2" [label="2: Exit bar::Rectangle::Rectangle \n  " color=yellow style=filled]
 	
 
-"Rectangle#Rectangle#foo#{8572033467385947510}.aa3c63f2774d4a30536ec4553aa11554_1" [label="1: Start foo::Rectangle::Rectangle\nFormals:  this:foo::Rectangle*\nLocals:  \n  " color=yellow style=filled]
+"Rectangle#Rectangle#foo#{6701516798176187835}.dc8f32758033179155ff166aa8f83896_1" [label="1: Start foo::Rectangle::Rectangle\nFormals:  this:foo::Rectangle*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Rectangle#Rectangle#foo#{8572033467385947510}.aa3c63f2774d4a30536ec4553aa11554_1" -> "Rectangle#Rectangle#foo#{8572033467385947510}.aa3c63f2774d4a30536ec4553aa11554_2" ;
-"Rectangle#Rectangle#foo#{8572033467385947510}.aa3c63f2774d4a30536ec4553aa11554_2" [label="2: Exit foo::Rectangle::Rectangle \n  " color=yellow style=filled]
+	 "Rectangle#Rectangle#foo#{6701516798176187835}.dc8f32758033179155ff166aa8f83896_1" -> "Rectangle#Rectangle#foo#{6701516798176187835}.dc8f32758033179155ff166aa8f83896_2" ;
+"Rectangle#Rectangle#foo#{6701516798176187835}.dc8f32758033179155ff166aa8f83896_2" [label="2: Exit foo::Rectangle::Rectangle \n  " color=yellow style=filled]
 	
 
-"#my_record#foo#{787932800218645857}.139a63942c62b7df5ae81187e8434e41_1" [label="1: Start foo::my_record::\nFormals:  this:foo::my_record*\nLocals:  \n  " color=yellow style=filled]
+"#my_record#foo#{31826141479385232}.d2da7dac332d9b22183ba06fa80eaa20_1" [label="1: Start foo::my_record::\nFormals:  this:foo::my_record*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#my_record#foo#{787932800218645857}.139a63942c62b7df5ae81187e8434e41_1" -> "#my_record#foo#{787932800218645857}.139a63942c62b7df5ae81187e8434e41_2" ;
-"#my_record#foo#{787932800218645857}.139a63942c62b7df5ae81187e8434e41_2" [label="2: Exit foo::my_record:: \n  " color=yellow style=filled]
+	 "#my_record#foo#{31826141479385232}.d2da7dac332d9b22183ba06fa80eaa20_1" -> "#my_record#foo#{31826141479385232}.d2da7dac332d9b22183ba06fa80eaa20_2" ;
+"#my_record#foo#{31826141479385232}.d2da7dac332d9b22183ba06fa80eaa20_2" [label="2: Exit foo::my_record:: \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/member_access_from_return.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/member_access_from_return.cpp.dot
index 81b85f716..f260f1bf7 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/member_access_from_return.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/reference/member_access_from_return.cpp.dot
@@ -78,11 +78,11 @@ digraph cfg {
 	
 
 	 "call#X#(5770224879682844394).d055b894c8e89eaff4b8d412706da082_4" -> "call#X#(5770224879682844394).d055b894c8e89eaff4b8d412706da082_2" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_1" [label="1: Start X::X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_1" [label="1: Start X::X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_1" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" [label="2: Exit X::X \n  " color=yellow style=filled]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_1" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_2" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_2" [label="2: Exit X::X \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/ptr_mem.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/ptr_mem.cpp.dot
index d0efaab5d..1c91d1597 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/ptr_mem.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/reference/ptr_mem.cpp.dot
@@ -19,34 +19,34 @@ digraph cfg {
 	
 
 	 "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_5" -> "noskip#6149941428299352091.c0e56085ae3c9567084b0f9e4211cfc0_4" ;
-"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_1" [label="1: Start List<item>::List\nFormals:  this:List<item>* next_ptr:void\nLocals:  \n  " color=yellow style=filled]
+"List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_1" [label="1: Start List<item>::List\nFormals:  this:List<item>* next_ptr:void\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_1" -> "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_5" ;
-"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_2" [label="2: Exit List<item>::List \n  " color=yellow style=filled]
+	 "List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_1" -> "List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_5" ;
+"List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_2" [label="2: Exit List<item>::List \n  " color=yellow style=filled]
 	
 
-"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_3" [label="3:  Constructor Init \n   n$1=*&this:List<item>* [line 14, column 42]\n " shape="box"]
+"List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_3" [label="3:  Constructor Init \n   n$1=*&this:List<item>* [line 14, column 42]\n " shape="box"]
 	
 
-	 "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_3" -> "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_4" ;
-"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_4" [label="4:  Constructor Init \n   n$2=*&next_ptr:void [line 14, column 51]\n  *n$1.next_ptr:void=n$2 [line 14, column 42]\n " shape="box"]
+	 "List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_3" -> "List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_4" ;
+"List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_4" [label="4:  Constructor Init \n   n$2=*&next_ptr:void [line 14, column 51]\n  *n$1.next_ptr:void=n$2 [line 14, column 42]\n " shape="box"]
 	
 
-	 "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_4" -> "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_2" ;
-"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_5" [label="5:  Constructor Init \n   n$3=*&this:List<item>* [line 14, column 27]\n " shape="box"]
+	 "List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_4" -> "List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_2" ;
+"List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_5" [label="5:  Constructor Init \n   n$3=*&this:List<item>* [line 14, column 27]\n " shape="box"]
 	
 
-	 "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_5" -> "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_6" ;
-"List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_6" [label="6:  Constructor Init \n   *n$3.head:item*=null [line 14, column 27]\n " shape="box"]
+	 "List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_5" -> "List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_6" ;
+"List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_6" [label="6:  Constructor Init \n   *n$3.head:item*=null [line 14, column 27]\n " shape="box"]
 	
 
-	 "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_6" -> "List#List<item>#{15914538297308632075}.3434f5c53e6f70f530bf6d3beb27430e_3" ;
-"item#item#{8704603758565933158}.444c1f007931991a5b2dfd25b7b090f5_1" [label="1: Start item::item\nFormals:  this:item*\nLocals:  \n  " color=yellow style=filled]
+	 "List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_6" -> "List#List<item>#{6798131711108694752}.197bd5352aecbe66695e4decc3b5b5dd_3" ;
+"item#item#{6834087089356173483}.7c337cfe8794ab58fca659fc467062d8_1" [label="1: Start item::item\nFormals:  this:item*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "item#item#{8704603758565933158}.444c1f007931991a5b2dfd25b7b090f5_1" -> "item#item#{8704603758565933158}.444c1f007931991a5b2dfd25b7b090f5_2" ;
-"item#item#{8704603758565933158}.444c1f007931991a5b2dfd25b7b090f5_2" [label="2: Exit item::item \n  " color=yellow style=filled]
+	 "item#item#{6834087089356173483}.7c337cfe8794ab58fca659fc467062d8_1" -> "item#item#{6834087089356173483}.7c337cfe8794ab58fca659fc467062d8_2" ;
+"item#item#{6834087089356173483}.7c337cfe8794ab58fca659fc467062d8_2" [label="2: Exit item::item \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/reference_field.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/reference_field.cpp.dot
index 1ef1be37d..af52b3943 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/reference_field.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/reference/reference_field.cpp.dot
@@ -402,29 +402,29 @@ digraph cfg {
 	
 
 	 "getI#Ptr#reference_field#(9990830118718700597).db587e508ad6680b9c85197fd72992d4_4" -> "getI#Ptr#reference_field#(9990830118718700597).db587e508ad6680b9c85197fd72992d4_2" ;
-"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_1" [label="1: Start reference_field::Ptr::Ptr\nFormals:  this:reference_field::Ptr* r_:reference_field::X&\nLocals:  \n  " color=yellow style=filled]
+"Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_1" [label="1: Start reference_field::Ptr::Ptr\nFormals:  this:reference_field::Ptr* r_:reference_field::X&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_1" -> "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_5" ;
-"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_2" [label="2: Exit reference_field::Ptr::Ptr \n  " color=yellow style=filled]
+	 "Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_1" -> "Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_5" ;
+"Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_2" [label="2: Exit reference_field::Ptr::Ptr \n  " color=yellow style=filled]
 	
 
-"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::Ptr* [line 32, column 24]\n " shape="box"]
+"Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::Ptr* [line 32, column 24]\n " shape="box"]
 	
 
-	 "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_3" -> "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_4" ;
-"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_4" [label="4:  Constructor Init \n   n$2=*&this:reference_field::Ptr* [line 32, column 27]\n  n$3=*n$2.x:reference_field::X* [line 32, column 27]\n  *n$1.i:int*=n$3.f [line 32, column 24]\n " shape="box"]
+	 "Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_3" -> "Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_4" ;
+"Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_4" [label="4:  Constructor Init \n   n$2=*&this:reference_field::Ptr* [line 32, column 27]\n  n$3=*n$2.x:reference_field::X* [line 32, column 27]\n  *n$1.i:int*=n$3.f [line 32, column 24]\n " shape="box"]
 	
 
-	 "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_4" -> "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_2" ;
-"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_5" [label="5:  Constructor Init \n   n$4=*&this:reference_field::Ptr* [line 32, column 16]\n " shape="box"]
+	 "Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_4" -> "Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_2" ;
+"Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_5" [label="5:  Constructor Init \n   n$4=*&this:reference_field::Ptr* [line 32, column 16]\n " shape="box"]
 	
 
-	 "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_5" -> "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_6" ;
-"Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_6" [label="6:  Constructor Init \n   n$5=*&r_:reference_field::X& [line 32, column 19]\n  *n$4.x:reference_field::X*=n$5 [line 32, column 16]\n " shape="box"]
+	 "Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_5" -> "Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_6" ;
+"Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_6" [label="6:  Constructor Init \n   n$5=*&r_:reference_field::X& [line 32, column 19]\n  *n$4.x:reference_field::X*=n$5 [line 32, column 16]\n " shape="box"]
 	
 
-	 "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_6" -> "Ptr#Ptr#reference_field#{6088279996118893652}.360bbf008525cb3c23d8ada20f2a72af_3" ;
+	 "Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_6" -> "Ptr#Ptr#reference_field#{5303596330455874677}.6286ccfb3e7bb6a38414e8d313496188_3" ;
 "getI#Ref#reference_field#(11319674367674692208).ab98b8b3de535d47d4b70092fc16ce37_1" [label="1: Start reference_field::Ref::getI\nFormals:  this:reference_field::Ref*\nLocals:  \n  " color=yellow style=filled]
 	
 
@@ -455,29 +455,29 @@ digraph cfg {
 	
 
 	 "getF#Ref#reference_field#(4333270831228787341).d47ae80c78316dac2e24a22fc076cf41_4" -> "getF#Ref#reference_field#(4333270831228787341).d47ae80c78316dac2e24a22fc076cf41_2" ;
-"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_1" [label="1: Start reference_field::Ref::Ref\nFormals:  this:reference_field::Ref* r_:reference_field::X&\nLocals:  \n  " color=yellow style=filled]
+"Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_1" [label="1: Start reference_field::Ref::Ref\nFormals:  this:reference_field::Ref* r_:reference_field::X&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_1" -> "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_5" ;
-"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_2" [label="2: Exit reference_field::Ref::Ref \n  " color=yellow style=filled]
+	 "Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_1" -> "Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_5" ;
+"Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_2" [label="2: Exit reference_field::Ref::Ref \n  " color=yellow style=filled]
 	
 
-"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::Ref* [line 24, column 23]\n " shape="box"]
+"Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::Ref* [line 24, column 23]\n " shape="box"]
 	
 
-	 "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_3" -> "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_4" ;
-"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_4" [label="4:  Constructor Init \n   n$2=*&this:reference_field::Ref* [line 24, column 25]\n  n$3=*n$2.x:reference_field::X& [line 24, column 25]\n  *n$1.i:int&=n$3.f [line 24, column 23]\n " shape="box"]
+	 "Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_3" -> "Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_4" ;
+"Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_4" [label="4:  Constructor Init \n   n$2=*&this:reference_field::Ref* [line 24, column 25]\n  n$3=*n$2.x:reference_field::X& [line 24, column 25]\n  *n$1.i:int&=n$3.f [line 24, column 23]\n " shape="box"]
 	
 
-	 "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_4" -> "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_2" ;
-"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_5" [label="5:  Constructor Init \n   n$4=*&this:reference_field::Ref* [line 24, column 16]\n " shape="box"]
+	 "Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_4" -> "Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_2" ;
+"Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_5" [label="5:  Constructor Init \n   n$4=*&this:reference_field::Ref* [line 24, column 16]\n " shape="box"]
 	
 
-	 "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_5" -> "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_6" ;
-"Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_6" [label="6:  Constructor Init \n   n$5=*&r_:reference_field::X& [line 24, column 18]\n  *n$4.x:reference_field::X&=n$5 [line 24, column 16]\n " shape="box"]
+	 "Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_5" -> "Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_6" ;
+"Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_6" [label="6:  Constructor Init \n   n$5=*&r_:reference_field::X& [line 24, column 18]\n  *n$4.x:reference_field::X&=n$5 [line 24, column 16]\n " shape="box"]
 	
 
-	 "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_6" -> "Ref#Ref#reference_field#{1778104277749367423}.02a281ecc4e6bde89182d1ef952810a2_3" ;
+	 "Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_6" -> "Ref#Ref#reference_field#{697437612503217650}.9df85b3faaec5d8e4c0cd91a43436f31_3" ;
 "getI#Val#reference_field#(5092177944978041506).c3db07b6697824cd689cc81f71b31e2a_1" [label="1: Start reference_field::Val::getI\nFormals:  this:reference_field::Val*\nLocals:  \n  " color=yellow style=filled]
 	
 
@@ -508,49 +508,49 @@ digraph cfg {
 	
 
 	 "getF#Val#reference_field#(5603383781744538435).f0720826d9b8abc0c6259038f1412318_4" -> "getF#Val#reference_field#(5603383781744538435).f0720826d9b8abc0c6259038f1412318_2" ;
-"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_1" [label="1: Start reference_field::Val::Val\nFormals:  this:reference_field::Val* r_:reference_field::X&\nLocals:  \n  " color=yellow style=filled]
+"Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_1" [label="1: Start reference_field::Val::Val\nFormals:  this:reference_field::Val* r_:reference_field::X&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_1" -> "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_5" ;
-"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_2" [label="2: Exit reference_field::Val::Val \n  " color=yellow style=filled]
+	 "Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_1" -> "Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_5" ;
+"Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_2" [label="2: Exit reference_field::Val::Val \n  " color=yellow style=filled]
 	
 
-"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::Val* [line 40, column 23]\n " shape="box"]
+"Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::Val* [line 40, column 23]\n " shape="box"]
 	
 
-	 "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_3" -> "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_4" ;
-"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_4" [label="4:  Constructor Init \n   n$2=*&this:reference_field::Val* [line 40, column 25]\n  n$3=*n$2.x.f:int [line 40, column 25]\n  *n$1.i:int=n$3 [line 40, column 23]\n " shape="box"]
+	 "Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_3" -> "Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_4" ;
+"Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_4" [label="4:  Constructor Init \n   n$2=*&this:reference_field::Val* [line 40, column 25]\n  n$3=*n$2.x.f:int [line 40, column 25]\n  *n$1.i:int=n$3 [line 40, column 23]\n " shape="box"]
 	
 
-	 "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_4" -> "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_2" ;
-"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_5" [label="5:  Constructor Init \n   n$4=*&this:reference_field::Val* [line 40, column 16]\n " shape="box"]
+	 "Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_4" -> "Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_2" ;
+"Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_5" [label="5:  Constructor Init \n   n$4=*&this:reference_field::Val* [line 40, column 16]\n " shape="box"]
 	
 
-	 "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_5" -> "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_6" ;
-"Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_6" [label="6:  Constructor Init \n   n$5=*&r_:reference_field::X& [line 40, column 18]\n  n$6=_fun_reference_field::X::X(n$4.x:reference_field::X*,n$5:reference_field::X&) [line 40, column 16]\n " shape="box"]
+	 "Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_5" -> "Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_6" ;
+"Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_6" [label="6:  Constructor Init \n   n$5=*&r_:reference_field::X& [line 40, column 18]\n  n$6=_fun_reference_field::X::X(n$4.x:reference_field::X*,n$5:reference_field::X&) [line 40, column 16]\n " shape="box"]
 	
 
-	 "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_6" -> "Val#Val#reference_field#{10086609758499948489}.3f0d77ba0039a38103c912b5065ccdaa_3" ;
-"X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_1" [label="1: Start reference_field::X::X\nFormals:  this:reference_field::X* __param_0:reference_field::X const &\nLocals:  \n  " color=yellow style=filled]
+	 "Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_6" -> "Val#Val#reference_field#{4788856549917862568}.b7d1ec35256cbe6a05257dc23f16dca0_3" ;
+"X#X#reference_field#{14378536680571594526|constexpr}.e2fe91bb92d7cac2870c43305a55ec80_1" [label="1: Start reference_field::X::X\nFormals:  this:reference_field::X* __param_0:reference_field::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_1" -> "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_3" ;
-"X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_2" [label="2: Exit reference_field::X::X \n  " color=yellow style=filled]
+	 "X#X#reference_field#{14378536680571594526|constexpr}.e2fe91bb92d7cac2870c43305a55ec80_1" -> "X#X#reference_field#{14378536680571594526|constexpr}.e2fe91bb92d7cac2870c43305a55ec80_3" ;
+"X#X#reference_field#{14378536680571594526|constexpr}.e2fe91bb92d7cac2870c43305a55ec80_2" [label="2: Exit reference_field::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::X* [line 10, column 8]\n " shape="box"]
+"X#X#reference_field#{14378536680571594526|constexpr}.e2fe91bb92d7cac2870c43305a55ec80_3" [label="3:  Constructor Init \n   n$1=*&this:reference_field::X* [line 10, column 8]\n " shape="box"]
 	
 
-	 "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_3" -> "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_4" ;
-"X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_4" [label="4:  Constructor Init \n   n$2=*&__param_0:reference_field::X const & [line 10, column 8]\n  n$3=*n$2.f:int [line 10, column 8]\n  *n$1.f:int=n$3 [line 10, column 8]\n " shape="box"]
+	 "X#X#reference_field#{14378536680571594526|constexpr}.e2fe91bb92d7cac2870c43305a55ec80_3" -> "X#X#reference_field#{14378536680571594526|constexpr}.e2fe91bb92d7cac2870c43305a55ec80_4" ;
+"X#X#reference_field#{14378536680571594526|constexpr}.e2fe91bb92d7cac2870c43305a55ec80_4" [label="4:  Constructor Init \n   n$2=*&__param_0:reference_field::X const & [line 10, column 8]\n  n$3=*n$2.f:int [line 10, column 8]\n  *n$1.f:int=n$3 [line 10, column 8]\n " shape="box"]
 	
 
-	 "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_4" -> "X#X#reference_field#{16892162000533972663|constexpr}.d3ad2332bde2031935fecc6685296b44_2" ;
-"X#X#reference_field#{2751762285772383996}.b7c8700d1b15a5db2c677bfc2eb37a5f_1" [label="1: Start reference_field::X::X\nFormals:  this:reference_field::X*\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#reference_field#{14378536680571594526|constexpr}.e2fe91bb92d7cac2870c43305a55ec80_4" -> "X#X#reference_field#{14378536680571594526|constexpr}.e2fe91bb92d7cac2870c43305a55ec80_2" ;
+"X#X#reference_field#{3492669295766283357}.5726e095a607366ecb73dddc4f6c2504_1" [label="1: Start reference_field::X::X\nFormals:  this:reference_field::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#reference_field#{2751762285772383996}.b7c8700d1b15a5db2c677bfc2eb37a5f_1" -> "X#X#reference_field#{2751762285772383996}.b7c8700d1b15a5db2c677bfc2eb37a5f_2" ;
-"X#X#reference_field#{2751762285772383996}.b7c8700d1b15a5db2c677bfc2eb37a5f_2" [label="2: Exit reference_field::X::X \n  " color=yellow style=filled]
+	 "X#X#reference_field#{3492669295766283357}.5726e095a607366ecb73dddc4f6c2504_1" -> "X#X#reference_field#{3492669295766283357}.5726e095a607366ecb73dddc4f6c2504_2" ;
+"X#X#reference_field#{3492669295766283357}.5726e095a607366ecb73dddc4f6c2504_2" [label="2: Exit reference_field::X::X \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/reference/reference_struct_e2e.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/reference/reference_struct_e2e.cpp.dot
index 598b2adbe..3afe93e35 100644
--- a/infer/tests/codetoanalyze/cpp/shared/reference/reference_struct_e2e.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/reference/reference_struct_e2e.cpp.dot
@@ -508,11 +508,11 @@ digraph cfg {
 	
 
 	 "div#X#(18085298371773708552).78228fdd912ebeeb718ac23bdc727c87_4" -> "div#X#(18085298371773708552).78228fdd912ebeeb718ac23bdc727c87_2" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_1" [label="1: Start X::X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_1" [label="1: Start X::X\nFormals:  this:X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_1" -> "X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" ;
-"X#X#{4951618003533511344}.a6c75b361b5e04dddb518f7e116a9ca2_2" [label="2: Exit X::X \n  " color=yellow style=filled]
+	 "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_1" -> "X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_2" ;
+"X#X#{5585564522356237825}.f0691bf51109589e6407e972842a942a_2" [label="2: Exit X::X \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/templates/class_specialization.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/templates/class_specialization.cpp.dot
index feffbcf03..bf3b7c953 100644
--- a/infer/tests/codetoanalyze/cpp/shared/templates/class_specialization.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/templates/class_specialization.cpp.dot
@@ -38,70 +38,70 @@ digraph cfg {
 	
 
 	 "foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_5" -> "foo_intptr#class_specialization#3914514069521239538.096096ddd8eb9462872f535952d6e0a5_4" ;
-"Base#Base<int*>#class_specialization#{14101392445423095049}.4481221d683f8e54c4527519cddc792a_1" [label="1: Start class_specialization::Base<int*>::Base\nFormals:  this:class_specialization::Base<int*>*\nLocals:  \n  " color=yellow style=filled]
+"Base#Base<int>#class_specialization#{15902445540563884688}.821ffe76c5503fe3610ae03e678a73ca_1" [label="1: Start class_specialization::Base<int>::Base\nFormals:  this:class_specialization::Base<int>*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Base#Base<int*>#class_specialization#{14101392445423095049}.4481221d683f8e54c4527519cddc792a_1" -> "Base#Base<int*>#class_specialization#{14101392445423095049}.4481221d683f8e54c4527519cddc792a_2" ;
-"Base#Base<int*>#class_specialization#{14101392445423095049}.4481221d683f8e54c4527519cddc792a_2" [label="2: Exit class_specialization::Base<int*>::Base \n  " color=yellow style=filled]
+	 "Base#Base<int>#class_specialization#{15902445540563884688}.821ffe76c5503fe3610ae03e678a73ca_1" -> "Base#Base<int>#class_specialization#{15902445540563884688}.821ffe76c5503fe3610ae03e678a73ca_2" ;
+"Base#Base<int>#class_specialization#{15902445540563884688}.821ffe76c5503fe3610ae03e678a73ca_2" [label="2: Exit class_specialization::Base<int>::Base \n  " color=yellow style=filled]
 	
 
-"Base#Base<int>#class_specialization#{16658552199303145313}.b6aa2df9eb4873c08c322ab298261cf8_1" [label="1: Start class_specialization::Base<int>::Base\nFormals:  this:class_specialization::Base<int>*\nLocals:  \n  " color=yellow style=filled]
+"Base#Base<int*>#class_specialization#{13345039496079115160}.0bbf5bf445811c84142b27e831c75c1f_1" [label="1: Start class_specialization::Base<int*>::Base\nFormals:  this:class_specialization::Base<int*>*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Base#Base<int>#class_specialization#{16658552199303145313}.b6aa2df9eb4873c08c322ab298261cf8_1" -> "Base#Base<int>#class_specialization#{16658552199303145313}.b6aa2df9eb4873c08c322ab298261cf8_2" ;
-"Base#Base<int>#class_specialization#{16658552199303145313}.b6aa2df9eb4873c08c322ab298261cf8_2" [label="2: Exit class_specialization::Base<int>::Base \n  " color=yellow style=filled]
+	 "Base#Base<int*>#class_specialization#{13345039496079115160}.0bbf5bf445811c84142b27e831c75c1f_1" -> "Base#Base<int*>#class_specialization#{13345039496079115160}.0bbf5bf445811c84142b27e831c75c1f_2" ;
+"Base#Base<int*>#class_specialization#{13345039496079115160}.0bbf5bf445811c84142b27e831c75c1f_2" [label="2: Exit class_specialization::Base<int*>::Base \n  " color=yellow style=filled]
 	
 
-"foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_1" [label="1: Start class_specialization::Derived<int*>::foo2\nFormals:  this:class_specialization::Derived<int*>* t:int*\nLocals:  \n  " color=yellow style=filled]
+"foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_1" [label="1: Start class_specialization::Derived<int>::foo\nFormals:  this:class_specialization::Derived<int>* t:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_1" -> "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_3" ;
-"foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_2" [label="2: Exit class_specialization::Derived<int*>::foo2 \n  " color=yellow style=filled]
+	 "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_1" -> "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_3" ;
+"foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_2" [label="2: Exit class_specialization::Derived<int>::foo \n  " color=yellow style=filled]
 	
 
-"foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class_specialization::Derived<int*>* [line 21, column 21]\n  n$1=*&t:int* [line 21, column 31]\n  *n$0.x:int*=n$1 [line 21, column 21]\n " shape="box"]
+"foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class_specialization::Derived<int>* [line 16, column 19]\n  n$1=*&t:int [line 16, column 29]\n  *n$0.x:int=n$1 [line 16, column 19]\n " shape="box"]
 	
 
-	 "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_3" -> "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_2" ;
-"Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_1" [label="1: Start class_specialization::Derived<int*>::Derived\nFormals:  this:class_specialization::Derived<int*>*\nLocals:  \n  " color=yellow style=filled]
+	 "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_3" -> "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_2" ;
+"Derived#Derived<int>#class_specialization#{14913832860840288761}.60fefe20ea02d6d5dd5b74bd319d920d_1" [label="1: Start class_specialization::Derived<int>::Derived\nFormals:  this:class_specialization::Derived<int>*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_1" -> "Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_3" ;
-"Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_2" [label="2: Exit class_specialization::Derived<int*>::Derived \n  " color=yellow style=filled]
+	 "Derived#Derived<int>#class_specialization#{14913832860840288761}.60fefe20ea02d6d5dd5b74bd319d920d_1" -> "Derived#Derived<int>#class_specialization#{14913832860840288761}.60fefe20ea02d6d5dd5b74bd319d920d_3" ;
+"Derived#Derived<int>#class_specialization#{14913832860840288761}.60fefe20ea02d6d5dd5b74bd319d920d_2" [label="2: Exit class_specialization::Derived<int>::Derived \n  " color=yellow style=filled]
 	
 
-"Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_3" [label="3:  Constructor Init \n   n$1=*&this:class_specialization::Derived<int*>* [line 20, column 8]\n " shape="box"]
+"Derived#Derived<int>#class_specialization#{14913832860840288761}.60fefe20ea02d6d5dd5b74bd319d920d_3" [label="3:  Constructor Init \n   n$1=*&this:class_specialization::Derived<int>* [line 15, column 8]\n " shape="box"]
 	
 
-	 "Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_3" -> "Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_4" ;
-"Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_4" [label="4:  Constructor Init \n   n$2=_fun_class_specialization::Base<int*>::Base(n$1:class_specialization::Derived<int*>*) [line 20, column 8]\n " shape="box"]
+	 "Derived#Derived<int>#class_specialization#{14913832860840288761}.60fefe20ea02d6d5dd5b74bd319d920d_3" -> "Derived#Derived<int>#class_specialization#{14913832860840288761}.60fefe20ea02d6d5dd5b74bd319d920d_4" ;
+"Derived#Derived<int>#class_specialization#{14913832860840288761}.60fefe20ea02d6d5dd5b74bd319d920d_4" [label="4:  Constructor Init \n   n$2=_fun_class_specialization::Base<int>::Base(n$1:class_specialization::Derived<int>*) [line 15, column 8]\n " shape="box"]
 	
 
-	 "Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_4" -> "Derived#Derived<int*>#class_specialization#{6947111178756325946}.2484a8b63b0d0003a390b6e57428fee2_2" ;
-"foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_1" [label="1: Start class_specialization::Derived<int>::foo\nFormals:  this:class_specialization::Derived<int>* t:int\nLocals:  \n  " color=yellow style=filled]
+	 "Derived#Derived<int>#class_specialization#{14913832860840288761}.60fefe20ea02d6d5dd5b74bd319d920d_4" -> "Derived#Derived<int>#class_specialization#{14913832860840288761}.60fefe20ea02d6d5dd5b74bd319d920d_2" ;
+"foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_1" [label="1: Start class_specialization::Derived<int*>::foo2\nFormals:  this:class_specialization::Derived<int*>* t:int*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_1" -> "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_3" ;
-"foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_2" [label="2: Exit class_specialization::Derived<int>::foo \n  " color=yellow style=filled]
+	 "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_1" -> "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_3" ;
+"foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_2" [label="2: Exit class_specialization::Derived<int*>::foo2 \n  " color=yellow style=filled]
 	
 
-"foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class_specialization::Derived<int>* [line 16, column 19]\n  n$1=*&t:int [line 16, column 29]\n  *n$0.x:int=n$1 [line 16, column 19]\n " shape="box"]
+"foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:class_specialization::Derived<int*>* [line 21, column 21]\n  n$1=*&t:int* [line 21, column 31]\n  *n$0.x:int*=n$1 [line 21, column 21]\n " shape="box"]
 	
 
-	 "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_3" -> "foo#Derived<int>#class_specialization#(3691368771332090182).157c4cba925bdfdc131986d2b52af05d_2" ;
-"Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_1" [label="1: Start class_specialization::Derived<int>::Derived\nFormals:  this:class_specialization::Derived<int>*\nLocals:  \n  " color=yellow style=filled]
+	 "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_3" -> "foo2#Derived<int*>#class_specialization#(12167928122938213289).9c7a2e679a7d7dcf0338960c56f01bd4_2" ;
+"Derived#Derived<int*>#class_specialization#{5076559325174463519}.9e943e8e8c3fa6146462e4e4555c1f4b_1" [label="1: Start class_specialization::Derived<int*>::Derived\nFormals:  this:class_specialization::Derived<int*>*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_1" -> "Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_3" ;
-"Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_2" [label="2: Exit class_specialization::Derived<int>::Derived \n  " color=yellow style=filled]
+	 "Derived#Derived<int*>#class_specialization#{5076559325174463519}.9e943e8e8c3fa6146462e4e4555c1f4b_1" -> "Derived#Derived<int*>#class_specialization#{5076559325174463519}.9e943e8e8c3fa6146462e4e4555c1f4b_3" ;
+"Derived#Derived<int*>#class_specialization#{5076559325174463519}.9e943e8e8c3fa6146462e4e4555c1f4b_2" [label="2: Exit class_specialization::Derived<int*>::Derived \n  " color=yellow style=filled]
 	
 
-"Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_3" [label="3:  Constructor Init \n   n$1=*&this:class_specialization::Derived<int>* [line 15, column 8]\n " shape="box"]
+"Derived#Derived<int*>#class_specialization#{5076559325174463519}.9e943e8e8c3fa6146462e4e4555c1f4b_3" [label="3:  Constructor Init \n   n$1=*&this:class_specialization::Derived<int*>* [line 20, column 8]\n " shape="box"]
 	
 
-	 "Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_3" -> "Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_4" ;
-"Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_4" [label="4:  Constructor Init \n   n$2=_fun_class_specialization::Base<int>::Base(n$1:class_specialization::Derived<int>*) [line 15, column 8]\n " shape="box"]
+	 "Derived#Derived<int*>#class_specialization#{5076559325174463519}.9e943e8e8c3fa6146462e4e4555c1f4b_3" -> "Derived#Derived<int*>#class_specialization#{5076559325174463519}.9e943e8e8c3fa6146462e4e4555c1f4b_4" ;
+"Derived#Derived<int*>#class_specialization#{5076559325174463519}.9e943e8e8c3fa6146462e4e4555c1f4b_4" [label="4:  Constructor Init \n   n$2=_fun_class_specialization::Base<int*>::Base(n$1:class_specialization::Derived<int*>*) [line 20, column 8]\n " shape="box"]
 	
 
-	 "Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_4" -> "Derived#Derived<int>#class_specialization#{14157761386473130888}.40e79d469e516a33fdff720996ff80ab_2" ;
+	 "Derived#Derived<int*>#class_specialization#{5076559325174463519}.9e943e8e8c3fa6146462e4e4555c1f4b_4" -> "Derived#Derived<int*>#class_specialization#{5076559325174463519}.9e943e8e8c3fa6146462e4e4555c1f4b_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/templates/class_template_instantiate.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/templates/class_template_instantiate.cpp.dot
index 8cfe5cb94..684d6d5fb 100644
--- a/infer/tests/codetoanalyze/cpp/shared/templates/class_template_instantiate.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/templates/class_template_instantiate.cpp.dot
@@ -120,34 +120,34 @@ digraph cfg {
 	
 
 	 "div#Choose2#(15124421267141903041).48bc5dd070e87512d292b60033d4f4ba_4" -> "div#Choose2#(15124421267141903041).48bc5dd070e87512d292b60033d4f4ba_2" ;
-"call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_1" [label="1: Start ExecStore<Choose2>::call_div\nFormals:  this:ExecStore<Choose2>* a:int\nLocals:  \n  " color=yellow style=filled]
+"call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_1" [label="1: Start ExecStore<Choose1>::call_div\nFormals:  this:ExecStore<Choose1>* a:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_1" -> "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_3" ;
-"call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_2" [label="2: Exit ExecStore<Choose2>::call_div \n  " color=yellow style=filled]
+	 "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_1" -> "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_3" ;
+"call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_2" [label="2: Exit ExecStore<Choose1>::call_div \n  " color=yellow style=filled]
 	
 
-"call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_3" [label="3:  Return Stmt \n   n$0=*&this:ExecStore<Choose2>* [line 24, column 12]\n  _=*n$0.f:Choose2 [line 24, column 12]\n  n$2=*&a:int [line 24, column 18]\n  n$3=_fun_Choose2::div(n$0.f:Choose2&,n$2:int,0:int) [line 24, column 12]\n " shape="box"]
+"call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_3" [label="3:  Return Stmt \n   n$0=*&this:ExecStore<Choose1>* [line 24, column 12]\n  _=*n$0.f:Choose1 [line 24, column 12]\n  n$2=*&a:int [line 24, column 18]\n  n$3=_fun_Choose1::div(n$0.f:Choose1&,n$2:int,0:int) [line 24, column 12]\n " shape="box"]
 	
 
-	 "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_3" -> "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_4" ;
-"call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_4" [label="4:  Return Stmt \n   *&return:int=n$3 [line 24, column 5]\n " shape="box"]
+	 "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_3" -> "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_4" ;
+"call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_4" [label="4:  Return Stmt \n   *&return:int=n$3 [line 24, column 5]\n " shape="box"]
 	
 
-	 "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_4" -> "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_2" ;
-"call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_1" [label="1: Start ExecStore<Choose1>::call_div\nFormals:  this:ExecStore<Choose1>* a:int\nLocals:  \n  " color=yellow style=filled]
+	 "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_4" -> "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_2" ;
+"call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_1" [label="1: Start ExecStore<Choose2>::call_div\nFormals:  this:ExecStore<Choose2>* a:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_1" -> "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_3" ;
-"call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_2" [label="2: Exit ExecStore<Choose1>::call_div \n  " color=yellow style=filled]
+	 "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_1" -> "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_3" ;
+"call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_2" [label="2: Exit ExecStore<Choose2>::call_div \n  " color=yellow style=filled]
 	
 
-"call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_3" [label="3:  Return Stmt \n   n$0=*&this:ExecStore<Choose1>* [line 24, column 12]\n  _=*n$0.f:Choose1 [line 24, column 12]\n  n$2=*&a:int [line 24, column 18]\n  n$3=_fun_Choose1::div(n$0.f:Choose1&,n$2:int,0:int) [line 24, column 12]\n " shape="box"]
+"call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_3" [label="3:  Return Stmt \n   n$0=*&this:ExecStore<Choose2>* [line 24, column 12]\n  _=*n$0.f:Choose2 [line 24, column 12]\n  n$2=*&a:int [line 24, column 18]\n  n$3=_fun_Choose2::div(n$0.f:Choose2&,n$2:int,0:int) [line 24, column 12]\n " shape="box"]
 	
 
-	 "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_3" -> "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_4" ;
-"call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_4" [label="4:  Return Stmt \n   *&return:int=n$3 [line 24, column 5]\n " shape="box"]
+	 "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_3" -> "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_4" ;
+"call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_4" [label="4:  Return Stmt \n   *&return:int=n$3 [line 24, column 5]\n " shape="box"]
 	
 
-	 "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_4" -> "call_div#ExecStore<Choose1>#(13821779640448790720).c684f7c620c64dbf19170e6c2add6779_2" ;
+	 "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_4" -> "call_div#ExecStore<Choose2>#(11829874625214834057).d639b1b8281e7bb31d011a0c7a797e72_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/templates/function.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/templates/function.cpp.dot
index 40c7f3705..932b75588 100644
--- a/infer/tests/codetoanalyze/cpp/shared/templates/function.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/templates/function.cpp.dot
@@ -185,11 +185,11 @@ digraph cfg {
 	
 
 	 "getVal#X1#function#(6016609736462046615).f1c1059b86daba05a044baaa3aeebb4d_3" -> "getVal#X1#function#(6016609736462046615).f1c1059b86daba05a044baaa3aeebb4d_2" ;
-"X1#X1#function#{8268447282679134664|constexpr}.0745429c26350d2b5e4ccb089a75cca3_1" [label="1: Start function::X1::X1\nFormals:  this:function::X1*\nLocals:  \n  " color=yellow style=filled]
+"X1#X1#function#{8779917002236402233|constexpr}.d5e976e615badc178a938519bc72fdd7_1" [label="1: Start function::X1::X1\nFormals:  this:function::X1*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X1#X1#function#{8268447282679134664|constexpr}.0745429c26350d2b5e4ccb089a75cca3_1" -> "X1#X1#function#{8268447282679134664|constexpr}.0745429c26350d2b5e4ccb089a75cca3_2" ;
-"X1#X1#function#{8268447282679134664|constexpr}.0745429c26350d2b5e4ccb089a75cca3_2" [label="2: Exit function::X1::X1 \n  " color=yellow style=filled]
+	 "X1#X1#function#{8779917002236402233|constexpr}.d5e976e615badc178a938519bc72fdd7_1" -> "X1#X1#function#{8779917002236402233|constexpr}.d5e976e615badc178a938519bc72fdd7_2" ;
+"X1#X1#function#{8779917002236402233|constexpr}.d5e976e615badc178a938519bc72fdd7_2" [label="2: Exit function::X1::X1 \n  " color=yellow style=filled]
 	
 
 "getVal#X2#function#(4809746707613911696).0109fe7d05b40f7cd003b5f24db7e996_1" [label="1: Start function::X2::getVal\nFormals:  this:function::X2*\nLocals:  \n  " color=yellow style=filled]
@@ -214,11 +214,11 @@ digraph cfg {
 	
 
 	 "get#X3#function#(14294522720635572005).f8ff5924ea2973135dd3eed8a26cb671_3" -> "get#X3#function#(14294522720635572005).f8ff5924ea2973135dd3eed8a26cb671_2" ;
-"X3#X3#function#{16145958216423895430|constexpr}.a7ec9df001ac855b3f6c0a5993984a6d_1" [label="1: Start function::X3::X3\nFormals:  this:function::X3*\nLocals:  \n  " color=yellow style=filled]
+"X3#X3#function#{14275160072237313739|constexpr}.1603c965b4ef09686df9196b3ebf2334_1" [label="1: Start function::X3::X3\nFormals:  this:function::X3*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X3#X3#function#{16145958216423895430|constexpr}.a7ec9df001ac855b3f6c0a5993984a6d_1" -> "X3#X3#function#{16145958216423895430|constexpr}.a7ec9df001ac855b3f6c0a5993984a6d_2" ;
-"X3#X3#function#{16145958216423895430|constexpr}.a7ec9df001ac855b3f6c0a5993984a6d_2" [label="2: Exit function::X3::X3 \n  " color=yellow style=filled]
+	 "X3#X3#function#{14275160072237313739|constexpr}.1603c965b4ef09686df9196b3ebf2334_1" -> "X3#X3#function#{14275160072237313739|constexpr}.1603c965b4ef09686df9196b3ebf2334_2" ;
+"X3#X3#function#{14275160072237313739|constexpr}.1603c965b4ef09686df9196b3ebf2334_2" [label="2: Exit function::X3::X3 \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/templates/method.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/templates/method.cpp.dot
index dd3267e4b..37ad9318f 100644
--- a/infer/tests/codetoanalyze/cpp/shared/templates/method.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/templates/method.cpp.dot
@@ -184,11 +184,11 @@ digraph cfg {
 	
 
 	 "get<method::X1>#Getter#method#(3247992624161763984).d85954e5db9a3e87e1f85274548baec1_4" -> "get<method::X1>#Getter#method#(3247992624161763984).d85954e5db9a3e87e1f85274548baec1_2" ;
-"Getter#Getter#method#{6538771732485235037|constexpr}.4e1a7679a514fd95621c9e075c8974f6_1" [label="1: Start method::Getter::Getter\nFormals:  this:method::Getter*\nLocals:  \n  " color=yellow style=filled]
+"Getter#Getter#method#{5797864722491335676|constexpr}.e2a7a9659ce89c66327976d2554948f3_1" [label="1: Start method::Getter::Getter\nFormals:  this:method::Getter*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Getter#Getter#method#{6538771732485235037|constexpr}.4e1a7679a514fd95621c9e075c8974f6_1" -> "Getter#Getter#method#{6538771732485235037|constexpr}.4e1a7679a514fd95621c9e075c8974f6_2" ;
-"Getter#Getter#method#{6538771732485235037|constexpr}.4e1a7679a514fd95621c9e075c8974f6_2" [label="2: Exit method::Getter::Getter \n  " color=yellow style=filled]
+	 "Getter#Getter#method#{5797864722491335676|constexpr}.e2a7a9659ce89c66327976d2554948f3_1" -> "Getter#Getter#method#{5797864722491335676|constexpr}.e2a7a9659ce89c66327976d2554948f3_2" ;
+"Getter#Getter#method#{5797864722491335676|constexpr}.e2a7a9659ce89c66327976d2554948f3_2" [label="2: Exit method::Getter::Getter \n  " color=yellow style=filled]
 	
 
 "get<method::X1>#GetterTempl<method::X1>#method#(1597660249660822780).26089da113d1a8570a849aa988e4ebd3_1" [label="1: Start method::GetterTempl<method::X1>::get<method::X1>\nFormals:  this:method::GetterTempl<method::X1>* t:method::X1& s:method::X1&\nLocals:  \n  " color=yellow style=filled]
@@ -206,33 +206,11 @@ digraph cfg {
 	
 
 	 "get<method::X1>#GetterTempl<method::X1>#method#(1597660249660822780).26089da113d1a8570a849aa988e4ebd3_4" -> "get<method::X1>#GetterTempl<method::X1>#method#(1597660249660822780).26089da113d1a8570a849aa988e4ebd3_2" ;
-"GetterTempl#GetterTempl<method::X1>#method#{11902154262179469385|constexpr}.419d9b7f14a1b25d173f0430e77d8bfb_1" [label="1: Start method::GetterTempl<method::X1>::GetterTempl\nFormals:  this:method::GetterTempl<method::X1>*\nLocals:  \n  " color=yellow style=filled]
+"GetterTempl#GetterTempl<method::X1>#method#{11390966017599023832|constexpr}.818e013e57ee5d00890e9d0cc89963b7_1" [label="1: Start method::GetterTempl<method::X1>::GetterTempl\nFormals:  this:method::GetterTempl<method::X1>*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "GetterTempl#GetterTempl<method::X1>#method#{11902154262179469385|constexpr}.419d9b7f14a1b25d173f0430e77d8bfb_1" -> "GetterTempl#GetterTempl<method::X1>#method#{11902154262179469385|constexpr}.419d9b7f14a1b25d173f0430e77d8bfb_2" ;
-"GetterTempl#GetterTempl<method::X1>#method#{11902154262179469385|constexpr}.419d9b7f14a1b25d173f0430e77d8bfb_2" [label="2: Exit method::GetterTempl<method::X1>::GetterTempl \n  " color=yellow style=filled]
-	
-
-"get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_1" [label="1: Start method::GetterTempl<method::X3>::get<method::X2>\nFormals:  this:method::GetterTempl<method::X3>* t:method::X3& s:method::X2&\nLocals:  \n  " color=yellow style=filled]
-	
-
-	 "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_1" -> "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_3" ;
-"get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_2" [label="2: Exit method::GetterTempl<method::X3>::get<method::X2> \n  " color=yellow style=filled]
-	
-
-"get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_3" [label="3:  Return Stmt \n   n$0=*&t:method::X3& [line 33, column 12]\n  _=*n$0:method::X3 [line 33, column 12]\n  n$2=_fun_method::X3::get(n$0:method::X3&) [line 33, column 12]\n  n$3=*&s:method::X2& [line 33, column 22]\n  _=*n$3:method::X2 [line 33, column 22]\n  n$5=_fun_method::X2::get(n$3:method::X2&) [line 33, column 22]\n " shape="box"]
-	
-
-	 "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_3" -> "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_4" ;
-"get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_4" [label="4:  Return Stmt \n   *&return:int=(n$2 + n$5) [line 33, column 5]\n " shape="box"]
-	
-
-	 "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_4" -> "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_2" ;
-"GetterTempl#GetterTempl<method::X3>#method#{18312978847092644663|constexpr}.45498dd9c6ecdd204d778582a0198bd9_1" [label="1: Start method::GetterTempl<method::X3>::GetterTempl\nFormals:  this:method::GetterTempl<method::X3>*\nLocals:  \n  " color=yellow style=filled]
-	
-
-	 "GetterTempl#GetterTempl<method::X3>#method#{18312978847092644663|constexpr}.45498dd9c6ecdd204d778582a0198bd9_1" -> "GetterTempl#GetterTempl<method::X3>#method#{18312978847092644663|constexpr}.45498dd9c6ecdd204d778582a0198bd9_2" ;
-"GetterTempl#GetterTempl<method::X3>#method#{18312978847092644663|constexpr}.45498dd9c6ecdd204d778582a0198bd9_2" [label="2: Exit method::GetterTempl<method::X3>::GetterTempl \n  " color=yellow style=filled]
+	 "GetterTempl#GetterTempl<method::X1>#method#{11390966017599023832|constexpr}.818e013e57ee5d00890e9d0cc89963b7_1" -> "GetterTempl#GetterTempl<method::X1>#method#{11390966017599023832|constexpr}.818e013e57ee5d00890e9d0cc89963b7_2" ;
+"GetterTempl#GetterTempl<method::X1>#method#{11390966017599023832|constexpr}.818e013e57ee5d00890e9d0cc89963b7_2" [label="2: Exit method::GetterTempl<method::X1>::GetterTempl \n  " color=yellow style=filled]
 	
 
 "get<method::X2>#GetterTempl<method::X2>#method#(242818219889731161).ce1c035f50382c57a6002fb874c7d273_1" [label="1: Start method::GetterTempl<method::X2>::get<method::X2>\nFormals:  this:method::GetterTempl<method::X2>* t:method::X2& s:method::X2&\nLocals:  \n  " color=yellow style=filled]
@@ -265,11 +243,33 @@ digraph cfg {
 	
 
 	 "get<method::X1>#GetterTempl<method::X2>#method#(5585877041217346556).4f87183f5216c7461b5259807b1f72ac_4" -> "get<method::X1>#GetterTempl<method::X2>#method#(5585877041217346556).4f87183f5216c7461b5259807b1f72ac_2" ;
-"GetterTempl#GetterTempl<method::X2>#method#{13405882915250525948|constexpr}.eb82a5c0e827f04da7e438cdbeef1353_1" [label="1: Start method::GetterTempl<method::X2>::GetterTempl\nFormals:  this:method::GetterTempl<method::X2>*\nLocals:  \n  " color=yellow style=filled]
+"GetterTempl#GetterTempl<method::X2>#method#{14146789925244425309|constexpr}.c7a91ad0a82a8f95ea9b5f2bd66f0d6b_1" [label="1: Start method::GetterTempl<method::X2>::GetterTempl\nFormals:  this:method::GetterTempl<method::X2>*\nLocals:  \n  " color=yellow style=filled]
+	
+
+	 "GetterTempl#GetterTempl<method::X2>#method#{14146789925244425309|constexpr}.c7a91ad0a82a8f95ea9b5f2bd66f0d6b_1" -> "GetterTempl#GetterTempl<method::X2>#method#{14146789925244425309|constexpr}.c7a91ad0a82a8f95ea9b5f2bd66f0d6b_2" ;
+"GetterTempl#GetterTempl<method::X2>#method#{14146789925244425309|constexpr}.c7a91ad0a82a8f95ea9b5f2bd66f0d6b_2" [label="2: Exit method::GetterTempl<method::X2>::GetterTempl \n  " color=yellow style=filled]
+	
+
+"get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_1" [label="1: Start method::GetterTempl<method::X3>::get<method::X2>\nFormals:  this:method::GetterTempl<method::X3>* t:method::X3& s:method::X2&\nLocals:  \n  " color=yellow style=filled]
+	
+
+	 "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_1" -> "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_3" ;
+"get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_2" [label="2: Exit method::GetterTempl<method::X3>::get<method::X2> \n  " color=yellow style=filled]
+	
+
+"get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_3" [label="3:  Return Stmt \n   n$0=*&t:method::X3& [line 33, column 12]\n  _=*n$0:method::X3 [line 33, column 12]\n  n$2=_fun_method::X3::get(n$0:method::X3&) [line 33, column 12]\n  n$3=*&s:method::X2& [line 33, column 22]\n  _=*n$3:method::X2 [line 33, column 22]\n  n$5=_fun_method::X2::get(n$3:method::X2&) [line 33, column 22]\n " shape="box"]
+	
+
+	 "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_3" -> "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_4" ;
+"get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_4" [label="4:  Return Stmt \n   *&return:int=(n$2 + n$5) [line 33, column 5]\n " shape="box"]
+	
+
+	 "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_4" -> "get<method::X2>#GetterTempl<method::X3>#method#(10966570090595029900).9a24a249e802c1b058a8d736330be11a_2" ;
+"GetterTempl#GetterTempl<method::X3>#method#{1614309827699496562|constexpr}.efaf50afda4bba49b25ed5e557a6c61f_1" [label="1: Start method::GetterTempl<method::X3>::GetterTempl\nFormals:  this:method::GetterTempl<method::X3>*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "GetterTempl#GetterTempl<method::X2>#method#{13405882915250525948|constexpr}.eb82a5c0e827f04da7e438cdbeef1353_1" -> "GetterTempl#GetterTempl<method::X2>#method#{13405882915250525948|constexpr}.eb82a5c0e827f04da7e438cdbeef1353_2" ;
-"GetterTempl#GetterTempl<method::X2>#method#{13405882915250525948|constexpr}.eb82a5c0e827f04da7e438cdbeef1353_2" [label="2: Exit method::GetterTempl<method::X2>::GetterTempl \n  " color=yellow style=filled]
+	 "GetterTempl#GetterTempl<method::X3>#method#{1614309827699496562|constexpr}.efaf50afda4bba49b25ed5e557a6c61f_1" -> "GetterTempl#GetterTempl<method::X3>#method#{1614309827699496562|constexpr}.efaf50afda4bba49b25ed5e557a6c61f_2" ;
+"GetterTempl#GetterTempl<method::X3>#method#{1614309827699496562|constexpr}.efaf50afda4bba49b25ed5e557a6c61f_2" [label="2: Exit method::GetterTempl<method::X3>::GetterTempl \n  " color=yellow style=filled]
 	
 
 "get#X1#method#(3540560026209954150).2509f5dd5568220867b48d85b777a860_1" [label="1: Start method::X1::get\nFormals:  this:method::X1*\nLocals:  \n  " color=yellow style=filled]
@@ -283,11 +283,11 @@ digraph cfg {
 	
 
 	 "get#X1#method#(3540560026209954150).2509f5dd5568220867b48d85b777a860_3" -> "get#X1#method#(3540560026209954150).2509f5dd5568220867b48d85b777a860_2" ;
-"X1#X1#method#{8420971029337099969|constexpr}.8e02b6260f5b71b6111249d54e85e5c8_1" [label="1: Start method::X1::X1\nFormals:  this:method::X1*\nLocals:  \n  " color=yellow style=filled]
+"X1#X1#method#{7787305985491195504|constexpr}.fd91730a33490daf16ec3014fbdc56f5_1" [label="1: Start method::X1::X1\nFormals:  this:method::X1*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X1#X1#method#{8420971029337099969|constexpr}.8e02b6260f5b71b6111249d54e85e5c8_1" -> "X1#X1#method#{8420971029337099969|constexpr}.8e02b6260f5b71b6111249d54e85e5c8_2" ;
-"X1#X1#method#{8420971029337099969|constexpr}.8e02b6260f5b71b6111249d54e85e5c8_2" [label="2: Exit method::X1::X1 \n  " color=yellow style=filled]
+	 "X1#X1#method#{7787305985491195504|constexpr}.fd91730a33490daf16ec3014fbdc56f5_1" -> "X1#X1#method#{7787305985491195504|constexpr}.fd91730a33490daf16ec3014fbdc56f5_2" ;
+"X1#X1#method#{7787305985491195504|constexpr}.fd91730a33490daf16ec3014fbdc56f5_2" [label="2: Exit method::X1::X1 \n  " color=yellow style=filled]
 	
 
 "get#X2#method#(12355996928057833031).c7a6c1beedda2f062a60f83f9b206b30_1" [label="1: Start method::X2::get\nFormals:  this:method::X2*\nLocals:  \n  " color=yellow style=filled]
@@ -301,11 +301,11 @@ digraph cfg {
 	
 
 	 "get#X2#method#(12355996928057833031).c7a6c1beedda2f062a60f83f9b206b30_3" -> "get#X2#method#(12355996928057833031).c7a6c1beedda2f062a60f83f9b206b30_2" ;
-"X2#X2#method#{4336714802122402348|constexpr}.917ee3865c4e917429f86bc2ade48e3a_1" [label="1: Start method::X2::X2\nFormals:  this:method::X2*\nLocals:  \n  " color=yellow style=filled]
+"X2#X2#method#{4832738582329589389|constexpr}.66021f4715c670b407f03c2fe9340d9a_1" [label="1: Start method::X2::X2\nFormals:  this:method::X2*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X2#X2#method#{4336714802122402348|constexpr}.917ee3865c4e917429f86bc2ade48e3a_1" -> "X2#X2#method#{4336714802122402348|constexpr}.917ee3865c4e917429f86bc2ade48e3a_2" ;
-"X2#X2#method#{4336714802122402348|constexpr}.917ee3865c4e917429f86bc2ade48e3a_2" [label="2: Exit method::X2::X2 \n  " color=yellow style=filled]
+	 "X2#X2#method#{4832738582329589389|constexpr}.66021f4715c670b407f03c2fe9340d9a_1" -> "X2#X2#method#{4832738582329589389|constexpr}.66021f4715c670b407f03c2fe9340d9a_2" ;
+"X2#X2#method#{4832738582329589389|constexpr}.66021f4715c670b407f03c2fe9340d9a_2" [label="2: Exit method::X2::X2 \n  " color=yellow style=filled]
 	
 
 "get#X3#method#(17779304111871376612).93de680a5d7c38b89b487ae7f0d986d6_1" [label="1: Start method::X3::get\nFormals:  this:method::X3*\nLocals:  \n  " color=yellow style=filled]
@@ -319,11 +319,11 @@ digraph cfg {
 	
 
 	 "get#X3#method#(17779304111871376612).93de680a5d7c38b89b487ae7f0d986d6_3" -> "get#X3#method#(17779304111871376612).93de680a5d7c38b89b487ae7f0d986d6_2" ;
-"X3#X3#method#{15810469599489961747|constexpr}.84155345220e181916e4d12f0c8086cb_1" [label="1: Start method::X3::X3\nFormals:  this:method::X3*\nLocals:  \n  " color=yellow style=filled]
+"X3#X3#method#{17681021453071824174|constexpr}.eb4f58af8298830b69c1946957fc11b9_1" [label="1: Start method::X3::X3\nFormals:  this:method::X3*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X3#X3#method#{15810469599489961747|constexpr}.84155345220e181916e4d12f0c8086cb_1" -> "X3#X3#method#{15810469599489961747|constexpr}.84155345220e181916e4d12f0c8086cb_2" ;
-"X3#X3#method#{15810469599489961747|constexpr}.84155345220e181916e4d12f0c8086cb_2" [label="2: Exit method::X3::X3 \n  " color=yellow style=filled]
+	 "X3#X3#method#{17681021453071824174|constexpr}.eb4f58af8298830b69c1946957fc11b9_1" -> "X3#X3#method#{17681021453071824174|constexpr}.eb4f58af8298830b69c1946957fc11b9_2" ;
+"X3#X3#method#{17681021453071824174|constexpr}.eb4f58af8298830b69c1946957fc11b9_2" [label="2: Exit method::X3::X3 \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/inheritance.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/inheritance.cpp.dot
index 871548840..a92120b79 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/inheritance.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/inheritance.cpp.dot
@@ -101,11 +101,11 @@ digraph cfg {
 	
 
 	 "fun#Base#(4745240833868289958).678df3fd06599dafd933a3bb8b9491bc_3" -> "fun#Base#(4745240833868289958).678df3fd06599dafd933a3bb8b9491bc_2" ;
-"Base#Base#{1639731840162335252|constexpr}.1cedec9037fb5c6b979582f8fd045cfb_1" [label="1: Start Base::Base\nFormals:  this:Base*\nLocals:  \n  " color=yellow style=filled]
+"Base#Base#{2135720435997419541|constexpr}.5c7ff8c6cd2b8f42e1ee459f75a5880f_1" [label="1: Start Base::Base\nFormals:  this:Base*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Base#Base#{1639731840162335252|constexpr}.1cedec9037fb5c6b979582f8fd045cfb_1" -> "Base#Base#{1639731840162335252|constexpr}.1cedec9037fb5c6b979582f8fd045cfb_2" ;
-"Base#Base#{1639731840162335252|constexpr}.1cedec9037fb5c6b979582f8fd045cfb_2" [label="2: Exit Base::Base \n  " color=yellow style=filled]
+	 "Base#Base#{2135720435997419541|constexpr}.5c7ff8c6cd2b8f42e1ee459f75a5880f_1" -> "Base#Base#{2135720435997419541|constexpr}.5c7ff8c6cd2b8f42e1ee459f75a5880f_2" ;
+"Base#Base#{2135720435997419541|constexpr}.5c7ff8c6cd2b8f42e1ee459f75a5880f_2" [label="2: Exit Base::Base \n  " color=yellow style=filled]
 	
 
 "fun_redefine#Sub#(17129416942188381963).92112cf746626b3b7cdf24f41680fdb8_1" [label="1: Start Sub::fun_redefine\nFormals:  this:Sub*\nLocals:  \n  " color=yellow style=filled]
@@ -119,19 +119,19 @@ digraph cfg {
 	
 
 	 "fun_redefine#Sub#(17129416942188381963).92112cf746626b3b7cdf24f41680fdb8_3" -> "fun_redefine#Sub#(17129416942188381963).92112cf746626b3b7cdf24f41680fdb8_2" ;
-"Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_1" [label="1: Start Sub::Sub\nFormals:  this:Sub*\nLocals:  \n  " color=yellow style=filled]
+"Sub#Sub#{12374099664347407997|constexpr}.af20bd2516d3e0bf3fb769d3f652862c_1" [label="1: Start Sub::Sub\nFormals:  this:Sub*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_1" -> "Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_3" ;
-"Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_2" [label="2: Exit Sub::Sub \n  " color=yellow style=filled]
+	 "Sub#Sub#{12374099664347407997|constexpr}.af20bd2516d3e0bf3fb769d3f652862c_1" -> "Sub#Sub#{12374099664347407997|constexpr}.af20bd2516d3e0bf3fb769d3f652862c_3" ;
+"Sub#Sub#{12374099664347407997|constexpr}.af20bd2516d3e0bf3fb769d3f652862c_2" [label="2: Exit Sub::Sub \n  " color=yellow style=filled]
 	
 
-"Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_3" [label="3:  Constructor Init \n   n$1=*&this:Sub* [line 14, column 7]\n " shape="box"]
+"Sub#Sub#{12374099664347407997|constexpr}.af20bd2516d3e0bf3fb769d3f652862c_3" [label="3:  Constructor Init \n   n$1=*&this:Sub* [line 14, column 7]\n " shape="box"]
 	
 
-	 "Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_3" -> "Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_4" ;
-"Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_4" [label="4:  Constructor Init \n   n$2=_fun_Base::Base(n$1:Sub*) [line 14, column 7]\n " shape="box"]
+	 "Sub#Sub#{12374099664347407997|constexpr}.af20bd2516d3e0bf3fb769d3f652862c_3" -> "Sub#Sub#{12374099664347407997|constexpr}.af20bd2516d3e0bf3fb769d3f652862c_4" ;
+"Sub#Sub#{12374099664347407997|constexpr}.af20bd2516d3e0bf3fb769d3f652862c_4" [label="4:  Constructor Init \n   n$2=_fun_Base::Base(n$1:Sub*) [line 14, column 7]\n " shape="box"]
 	
 
-	 "Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_4" -> "Sub#Sub#{11878357359117042972|constexpr}.886e3a99a94b49e456c4d39277ccc93b_2" ;
+	 "Sub#Sub#{12374099664347407997|constexpr}.af20bd2516d3e0bf3fb769d3f652862c_4" -> "Sub#Sub#{12374099664347407997|constexpr}.af20bd2516d3e0bf3fb769d3f652862c_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/inheritance_casts.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/inheritance_casts.cpp.dot
index 32386b1bb..dbcc1b2c5 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/inheritance_casts.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/inheritance_casts.cpp.dot
@@ -145,56 +145,56 @@ digraph cfg {
 	
 
 	 "getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_7" -> "getB#inheritance_casts(class inheritance_casts::B)#7572693428029732371.903fb8dc56797768f6ca6ebdf511cdaf_6" ;
-"A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_1" [label="1: Start inheritance_casts::A::A\nFormals:  this:inheritance_casts::A* __param_0:inheritance_casts::A&\nLocals:  \n  " color=yellow style=filled]
+"A#A#inheritance_casts#{5177723221953429334|constexpr}.d879dee3f88663ca993709cf90addd1e_1" [label="1: Start inheritance_casts::A::A\nFormals:  this:inheritance_casts::A* __param_0:inheritance_casts::A&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_1" -> "A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_3" ;
-"A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_2" [label="2: Exit inheritance_casts::A::A \n  " color=yellow style=filled]
+	 "A#A#inheritance_casts#{5177723221953429334|constexpr}.d879dee3f88663ca993709cf90addd1e_1" -> "A#A#inheritance_casts#{5177723221953429334|constexpr}.d879dee3f88663ca993709cf90addd1e_3" ;
+"A#A#inheritance_casts#{5177723221953429334|constexpr}.d879dee3f88663ca993709cf90addd1e_2" [label="2: Exit inheritance_casts::A::A \n  " color=yellow style=filled]
 	
 
-"A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_3" [label="3:  Constructor Init \n   n$1=*&this:inheritance_casts::A* [line 8, column 8]\n " shape="box"]
+"A#A#inheritance_casts#{5177723221953429334|constexpr}.d879dee3f88663ca993709cf90addd1e_3" [label="3:  Constructor Init \n   n$1=*&this:inheritance_casts::A* [line 8, column 8]\n " shape="box"]
 	
 
-	 "A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_3" -> "A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_4" ;
-"A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_4" [label="4:  Constructor Init \n   n$2=*&__param_0:inheritance_casts::A& [line 8, column 8]\n  n$3=*n$2.f:int [line 8, column 8]\n  *n$1.f:int=n$3 [line 8, column 8]\n " shape="box"]
+	 "A#A#inheritance_casts#{5177723221953429334|constexpr}.d879dee3f88663ca993709cf90addd1e_3" -> "A#A#inheritance_casts#{5177723221953429334|constexpr}.d879dee3f88663ca993709cf90addd1e_4" ;
+"A#A#inheritance_casts#{5177723221953429334|constexpr}.d879dee3f88663ca993709cf90addd1e_4" [label="4:  Constructor Init \n   n$2=*&__param_0:inheritance_casts::A& [line 8, column 8]\n  n$3=*n$2.f:int [line 8, column 8]\n  *n$1.f:int=n$3 [line 8, column 8]\n " shape="box"]
 	
 
-	 "A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_4" -> "A#A#inheritance_casts#{10902709585585133973|constexpr}.68880ef701101d56bd12eca3d63ad60a_2" ;
-"A#A#inheritance_casts#{6737151014147281904}.09f433918891d7b3e607a370cf5bfca4_1" [label="1: Start inheritance_casts::A::A\nFormals:  this:inheritance_casts::A*\nLocals:  \n  " color=yellow style=filled]
+	 "A#A#inheritance_casts#{5177723221953429334|constexpr}.d879dee3f88663ca993709cf90addd1e_4" -> "A#A#inheritance_casts#{5177723221953429334|constexpr}.d879dee3f88663ca993709cf90addd1e_2" ;
+"A#A#inheritance_casts#{7370816057993186369}.2a0cd11dc2c8bdbd1cce3b7e630e356b_1" [label="1: Start inheritance_casts::A::A\nFormals:  this:inheritance_casts::A*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "A#A#inheritance_casts#{6737151014147281904}.09f433918891d7b3e607a370cf5bfca4_1" -> "A#A#inheritance_casts#{6737151014147281904}.09f433918891d7b3e607a370cf5bfca4_2" ;
-"A#A#inheritance_casts#{6737151014147281904}.09f433918891d7b3e607a370cf5bfca4_2" [label="2: Exit inheritance_casts::A::A \n  " color=yellow style=filled]
+	 "A#A#inheritance_casts#{7370816057993186369}.2a0cd11dc2c8bdbd1cce3b7e630e356b_1" -> "A#A#inheritance_casts#{7370816057993186369}.2a0cd11dc2c8bdbd1cce3b7e630e356b_2" ;
+"A#A#inheritance_casts#{7370816057993186369}.2a0cd11dc2c8bdbd1cce3b7e630e356b_2" [label="2: Exit inheritance_casts::A::A \n  " color=yellow style=filled]
 	
 
-"B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_1" [label="1: Start inheritance_casts::B::B\nFormals:  this:inheritance_casts::B* __param_0:inheritance_casts::B&\nLocals:  \n  " color=yellow style=filled]
+"B#B#inheritance_casts#{1524938702708619033|constexpr}.46aad82ac7f8954318e9ecbbb0f427e3_1" [label="1: Start inheritance_casts::B::B\nFormals:  this:inheritance_casts::B* __param_0:inheritance_casts::B&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_1" -> "B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_3" ;
-"B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_2" [label="2: Exit inheritance_casts::B::B \n  " color=yellow style=filled]
+	 "B#B#inheritance_casts#{1524938702708619033|constexpr}.46aad82ac7f8954318e9ecbbb0f427e3_1" -> "B#B#inheritance_casts#{1524938702708619033|constexpr}.46aad82ac7f8954318e9ecbbb0f427e3_3" ;
+"B#B#inheritance_casts#{1524938702708619033|constexpr}.46aad82ac7f8954318e9ecbbb0f427e3_2" [label="2: Exit inheritance_casts::B::B \n  " color=yellow style=filled]
 	
 
-"B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_3" [label="3:  Constructor Init \n   n$1=*&this:inheritance_casts::B* [line 11, column 8]\n " shape="box"]
+"B#B#inheritance_casts#{1524938702708619033|constexpr}.46aad82ac7f8954318e9ecbbb0f427e3_3" [label="3:  Constructor Init \n   n$1=*&this:inheritance_casts::B* [line 11, column 8]\n " shape="box"]
 	
 
-	 "B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_3" -> "B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_4" ;
-"B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_4" [label="4:  Constructor Init \n   n$2=*&__param_0:inheritance_casts::B& [line 11, column 8]\n  n$3=_fun_inheritance_casts::A::A(n$1:inheritance_casts::B*,n$2:inheritance_casts::B&) [line 11, column 8]\n " shape="box"]
+	 "B#B#inheritance_casts#{1524938702708619033|constexpr}.46aad82ac7f8954318e9ecbbb0f427e3_3" -> "B#B#inheritance_casts#{1524938702708619033|constexpr}.46aad82ac7f8954318e9ecbbb0f427e3_4" ;
+"B#B#inheritance_casts#{1524938702708619033|constexpr}.46aad82ac7f8954318e9ecbbb0f427e3_4" [label="4:  Constructor Init \n   n$2=*&__param_0:inheritance_casts::B& [line 11, column 8]\n  n$3=_fun_inheritance_casts::A::A(n$1:inheritance_casts::B*,n$2:inheritance_casts::B&) [line 11, column 8]\n " shape="box"]
 	
 
-	 "B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_4" -> "B#B#inheritance_casts#{757591507791864682|constexpr}.5bcf15d1bf21f1370c2f899ddef4b1c9_2" ;
-"B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_1" [label="1: Start inheritance_casts::B::B\nFormals:  this:inheritance_casts::B*\nLocals:  \n  " color=yellow style=filled]
+	 "B#B#inheritance_casts#{1524938702708619033|constexpr}.46aad82ac7f8954318e9ecbbb0f427e3_4" -> "B#B#inheritance_casts#{1524938702708619033|constexpr}.46aad82ac7f8954318e9ecbbb0f427e3_2" ;
+"B#B#inheritance_casts#{9060408154611102004}.9c71feed9e0690adf90538a551cad576_1" [label="1: Start inheritance_casts::B::B\nFormals:  this:inheritance_casts::B*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_1" -> "B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_3" ;
-"B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_2" [label="2: Exit inheritance_casts::B::B \n  " color=yellow style=filled]
+	 "B#B#inheritance_casts#{9060408154611102004}.9c71feed9e0690adf90538a551cad576_1" -> "B#B#inheritance_casts#{9060408154611102004}.9c71feed9e0690adf90538a551cad576_3" ;
+"B#B#inheritance_casts#{9060408154611102004}.9c71feed9e0690adf90538a551cad576_2" [label="2: Exit inheritance_casts::B::B \n  " color=yellow style=filled]
 	
 
-"B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_3" [label="3:  Constructor Init \n   n$1=*&this:inheritance_casts::B* [line 11, column 8]\n " shape="box"]
+"B#B#inheritance_casts#{9060408154611102004}.9c71feed9e0690adf90538a551cad576_3" [label="3:  Constructor Init \n   n$1=*&this:inheritance_casts::B* [line 11, column 8]\n " shape="box"]
 	
 
-	 "B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_3" -> "B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_4" ;
-"B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_4" [label="4:  Constructor Init \n   n$2=_fun_inheritance_casts::A::A(n$1:inheritance_casts::B*) [line 11, column 8]\n " shape="box"]
+	 "B#B#inheritance_casts#{9060408154611102004}.9c71feed9e0690adf90538a551cad576_3" -> "B#B#inheritance_casts#{9060408154611102004}.9c71feed9e0690adf90538a551cad576_4" ;
+"B#B#inheritance_casts#{9060408154611102004}.9c71feed9e0690adf90538a551cad576_4" [label="4:  Constructor Init \n   n$2=_fun_inheritance_casts::A::A(n$1:inheritance_casts::B*) [line 11, column 8]\n " shape="box"]
 	
 
-	 "B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_4" -> "B#B#inheritance_casts#{9678838365339542453}.8b569e08272bb08f8843c357c8546f65_2" ;
+	 "B#B#inheritance_casts#{9060408154611102004}.9c71feed9e0690adf90538a551cad576_4" -> "B#B#inheritance_casts#{9060408154611102004}.9c71feed9e0690adf90538a551cad576_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/return_struct.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/return_struct.cpp.dot
index 7ad15f7de..5db8513e3 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/return_struct.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/return_struct.cpp.dot
@@ -180,26 +180,26 @@ digraph cfg {
 	
 
 	 "div#X#return_struct#(9073902918758280554).5ec34a4946de2226a51954167b2298aa_4" -> "div#X#return_struct#(9073902918758280554).5ec34a4946de2226a51954167b2298aa_2" ;
-"X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_1" [label="1: Start return_struct::X::X\nFormals:  this:return_struct::X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#return_struct#{11996548542918702168}.5f283169cbccf622b3d436ac75c52732_1" [label="1: Start return_struct::X::X\nFormals:  this:return_struct::X* x:return_struct::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_1" -> "X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_3" ;
-"X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_2" [label="2: Exit return_struct::X::X \n  " color=yellow style=filled]
+	 "X#X#return_struct#{11996548542918702168}.5f283169cbccf622b3d436ac75c52732_1" -> "X#X#return_struct#{11996548542918702168}.5f283169cbccf622b3d436ac75c52732_3" ;
+"X#X#return_struct#{11996548542918702168}.5f283169cbccf622b3d436ac75c52732_2" [label="2: Exit return_struct::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:return_struct::X* [line 14, column 9]\n  *n$0.f:int=1 [line 14, column 9]\n " shape="box"]
+"X#X#return_struct#{11996548542918702168}.5f283169cbccf622b3d436ac75c52732_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:return_struct::X* [line 13, column 19]\n  n$1=*&x:return_struct::X const & [line 13, column 23]\n  n$2=*n$1.f:int [line 13, column 23]\n  *n$0.f:int=n$2 [line 13, column 19]\n " shape="box"]
 	
 
-	 "X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_3" -> "X#X#return_struct#{16980707005325791470}.5cc7c757bfe221e617030d485a90aa08_2" ;
-"X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_1" [label="1: Start return_struct::X::X\nFormals:  this:return_struct::X* x:return_struct::X const &\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#return_struct#{11996548542918702168}.5f283169cbccf622b3d436ac75c52732_3" -> "X#X#return_struct#{11996548542918702168}.5f283169cbccf622b3d436ac75c52732_2" ;
+"X#X#return_struct#{15110155151743929043}.acca57c4764b815fd56ca37bc7d69bd1_1" [label="1: Start return_struct::X::X\nFormals:  this:return_struct::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_1" -> "X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_3" ;
-"X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_2" [label="2: Exit return_struct::X::X \n  " color=yellow style=filled]
+	 "X#X#return_struct#{15110155151743929043}.acca57c4764b815fd56ca37bc7d69bd1_1" -> "X#X#return_struct#{15110155151743929043}.acca57c4764b815fd56ca37bc7d69bd1_3" ;
+"X#X#return_struct#{15110155151743929043}.acca57c4764b815fd56ca37bc7d69bd1_2" [label="2: Exit return_struct::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:return_struct::X* [line 13, column 19]\n  n$1=*&x:return_struct::X const & [line 13, column 23]\n  n$2=*n$1.f:int [line 13, column 23]\n  *n$0.f:int=n$2 [line 13, column 19]\n " shape="box"]
+"X#X#return_struct#{15110155151743929043}.acca57c4764b815fd56ca37bc7d69bd1_3" [label="3:  BinaryOperatorStmt: Assign \n   n$0=*&this:return_struct::X* [line 14, column 9]\n  *n$0.f:int=1 [line 14, column 9]\n " shape="box"]
 	
 
-	 "X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_3" -> "X#X#return_struct#{2874542973664462157}.c7820661c77babcd49c610d7742e613f_2" ;
+	 "X#X#return_struct#{15110155151743929043}.acca57c4764b815fd56ca37bc7d69bd1_3" -> "X#X#return_struct#{15110155151743929043}.acca57c4764b815fd56ca37bc7d69bd1_2" ;
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/struct_forward_declare.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/struct_forward_declare.cpp.dot
index 4780c3821..f3a5650d7 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/struct_forward_declare.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/struct_forward_declare.cpp.dot
@@ -154,11 +154,11 @@ digraph cfg {
 	
 
 	 "getF#X#struct_forward_declare#(234869530037436282).15dd2207cd05d172845e5598032cd97a_4" -> "getF#X#struct_forward_declare#(234869530037436282).15dd2207cd05d172845e5598032cd97a_2" ;
-"X#X#struct_forward_declare#{12172734746422509138}.f95806aaac40e962cb02caab9f49a493_1" [label="1: Start struct_forward_declare::X::X\nFormals:  this:struct_forward_declare::X*\nLocals:  \n  " color=yellow style=filled]
+"X#X#struct_forward_declare#{10301936602235927447}.5e7cd564a01340a9d509acf11c421eb7_1" [label="1: Start struct_forward_declare::X::X\nFormals:  this:struct_forward_declare::X*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#struct_forward_declare#{12172734746422509138}.f95806aaac40e962cb02caab9f49a493_1" -> "X#X#struct_forward_declare#{12172734746422509138}.f95806aaac40e962cb02caab9f49a493_2" ;
-"X#X#struct_forward_declare#{12172734746422509138}.f95806aaac40e962cb02caab9f49a493_2" [label="2: Exit struct_forward_declare::X::X \n  " color=yellow style=filled]
+	 "X#X#struct_forward_declare#{10301936602235927447}.5e7cd564a01340a9d509acf11c421eb7_1" -> "X#X#struct_forward_declare#{10301936602235927447}.5e7cd564a01340a9d509acf11c421eb7_2" ;
+"X#X#struct_forward_declare#{10301936602235927447}.5e7cd564a01340a9d509acf11c421eb7_2" [label="2: Exit struct_forward_declare::X::X \n  " color=yellow style=filled]
 	
 
 "getF#Z#struct_forward_declare#(5569044973946019300).d77d2dfdba7ae36577dff1573b1c79e7_1" [label="1: Start struct_forward_declare::Z::getF\nFormals:  this:struct_forward_declare::Z*\nLocals:  \n  " color=yellow style=filled]
@@ -176,11 +176,11 @@ digraph cfg {
 	
 
 	 "getF#Z#struct_forward_declare#(5569044973946019300).d77d2dfdba7ae36577dff1573b1c79e7_4" -> "getF#Z#struct_forward_declare#(5569044973946019300).d77d2dfdba7ae36577dff1573b1c79e7_2" ;
-"Z#Z#struct_forward_declare#{16651271592300819332}.ef9c70a1786f586f582ba5bab79ecd77_1" [label="1: Start struct_forward_declare::Z::Z\nFormals:  this:struct_forward_declare::Z*\nLocals:  \n  " color=yellow style=filled]
+"Z#Z#struct_forward_declare#{17147260188135903621}.69967d74877693b8d44e01de936d1a6b_1" [label="1: Start struct_forward_declare::Z::Z\nFormals:  this:struct_forward_declare::Z*\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Z#Z#struct_forward_declare#{16651271592300819332}.ef9c70a1786f586f582ba5bab79ecd77_1" -> "Z#Z#struct_forward_declare#{16651271592300819332}.ef9c70a1786f586f582ba5bab79ecd77_2" ;
-"Z#Z#struct_forward_declare#{16651271592300819332}.ef9c70a1786f586f582ba5bab79ecd77_2" [label="2: Exit struct_forward_declare::Z::Z \n  " color=yellow style=filled]
+	 "Z#Z#struct_forward_declare#{17147260188135903621}.69967d74877693b8d44e01de936d1a6b_1" -> "Z#Z#struct_forward_declare#{17147260188135903621}.69967d74877693b8d44e01de936d1a6b_2" ;
+"Z#Z#struct_forward_declare#{17147260188135903621}.69967d74877693b8d44e01de936d1a6b_2" [label="2: Exit struct_forward_declare::Z::Z \n  " color=yellow style=filled]
 	
 
 }
diff --git a/infer/tests/codetoanalyze/cpp/shared/types/struct_pass_by_value.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/types/struct_pass_by_value.cpp.dot
index e3cfa5b91..485fa2792 100644
--- a/infer/tests/codetoanalyze/cpp/shared/types/struct_pass_by_value.cpp.dot
+++ b/infer/tests/codetoanalyze/cpp/shared/types/struct_pass_by_value.cpp.dot
@@ -171,64 +171,64 @@ digraph cfg {
 	
 
 	 "var_div1#struct_pass_by_value#11501824865066029482.b667f3a6d8153cf4e571282bd064fc22_5" -> "var_div1#struct_pass_by_value#11501824865066029482.b667f3a6d8153cf4e571282bd064fc22_3" ;
-"X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_1" [label="1: Start struct_pass_by_value::X::X\nFormals:  this:struct_pass_by_value::X* f:int\nLocals:  \n  " color=yellow style=filled]
+"X#X#struct_pass_by_value#{10692205318349234485}.f4e0c763bea81c11f96aa74eb1797fca_1" [label="1: Start struct_pass_by_value::X::X\nFormals:  this:struct_pass_by_value::X* f:int\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_1" -> "X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_3" ;
-"X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_2" [label="2: Exit struct_pass_by_value::X::X \n  " color=yellow style=filled]
+	 "X#X#struct_pass_by_value#{10692205318349234485}.f4e0c763bea81c11f96aa74eb1797fca_1" -> "X#X#struct_pass_by_value#{10692205318349234485}.f4e0c763bea81c11f96aa74eb1797fca_3" ;
+"X#X#struct_pass_by_value#{10692205318349234485}.f4e0c763bea81c11f96aa74eb1797fca_2" [label="2: Exit struct_pass_by_value::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::X* [line 12, column 14]\n " shape="box"]
+"X#X#struct_pass_by_value#{10692205318349234485}.f4e0c763bea81c11f96aa74eb1797fca_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::X* [line 12, column 14]\n " shape="box"]
 	
 
-	 "X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_3" -> "X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_4" ;
-"X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_4" [label="4:  Constructor Init \n   n$2=*&f:int [line 12, column 16]\n  *n$1.f:int=n$2 [line 12, column 14]\n " shape="box"]
+	 "X#X#struct_pass_by_value#{10692205318349234485}.f4e0c763bea81c11f96aa74eb1797fca_3" -> "X#X#struct_pass_by_value#{10692205318349234485}.f4e0c763bea81c11f96aa74eb1797fca_4" ;
+"X#X#struct_pass_by_value#{10692205318349234485}.f4e0c763bea81c11f96aa74eb1797fca_4" [label="4:  Constructor Init \n   n$2=*&f:int [line 12, column 16]\n  *n$1.f:int=n$2 [line 12, column 14]\n " shape="box"]
 	
 
-	 "X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_4" -> "X#X#struct_pass_by_value#{11203369373673859396}.cf8c3ea98f014a538f7f90e4593e75eb_2" ;
-"X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_1" [label="1: Start struct_pass_by_value::X::X\nFormals:  this:struct_pass_by_value::X* __param_0:struct_pass_by_value::X&\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#struct_pass_by_value#{10692205318349234485}.f4e0c763bea81c11f96aa74eb1797fca_4" -> "X#X#struct_pass_by_value#{10692205318349234485}.f4e0c763bea81c11f96aa74eb1797fca_2" ;
+"X#X#struct_pass_by_value#{5791089659555636003|constexpr}.a9551f199f3383ace89817ab086723a4_1" [label="1: Start struct_pass_by_value::X::X\nFormals:  this:struct_pass_by_value::X* __param_0:struct_pass_by_value::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_1" -> "X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_3" ;
-"X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_2" [label="2: Exit struct_pass_by_value::X::X \n  " color=yellow style=filled]
+	 "X#X#struct_pass_by_value#{5791089659555636003|constexpr}.a9551f199f3383ace89817ab086723a4_1" -> "X#X#struct_pass_by_value#{5791089659555636003|constexpr}.a9551f199f3383ace89817ab086723a4_3" ;
+"X#X#struct_pass_by_value#{5791089659555636003|constexpr}.a9551f199f3383ace89817ab086723a4_2" [label="2: Exit struct_pass_by_value::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::X* [line 10, column 8]\n " shape="box"]
+"X#X#struct_pass_by_value#{5791089659555636003|constexpr}.a9551f199f3383ace89817ab086723a4_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::X* [line 10, column 8]\n " shape="box"]
 	
 
-	 "X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_3" -> "X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_4" ;
-"X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_pass_by_value::X& [line 10, column 8]\n  n$3=*n$2.f:int [line 10, column 8]\n  *n$1.f:int=n$3 [line 10, column 8]\n " shape="box"]
+	 "X#X#struct_pass_by_value#{5791089659555636003|constexpr}.a9551f199f3383ace89817ab086723a4_3" -> "X#X#struct_pass_by_value#{5791089659555636003|constexpr}.a9551f199f3383ace89817ab086723a4_4" ;
+"X#X#struct_pass_by_value#{5791089659555636003|constexpr}.a9551f199f3383ace89817ab086723a4_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_pass_by_value::X const & [line 10, column 8]\n  n$3=*n$2.f:int [line 10, column 8]\n  *n$1.f:int=n$3 [line 10, column 8]\n " shape="box"]
 	
 
-	 "X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_4" -> "X#X#struct_pass_by_value#{8495470270182220238|constexpr}.ea3fe0be489de1d7a9283f9ea7d8899f_2" ;
-"X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_1" [label="1: Start struct_pass_by_value::X::X\nFormals:  this:struct_pass_by_value::X* __param_0:struct_pass_by_value::X const &\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#struct_pass_by_value#{5791089659555636003|constexpr}.a9551f199f3383ace89817ab086723a4_4" -> "X#X#struct_pass_by_value#{5791089659555636003|constexpr}.a9551f199f3383ace89817ab086723a4_2" ;
+"X#X#struct_pass_by_value#{9877988472483132493|constexpr}.d7be6bdda4cd13032aaeffd34cab9cfa_1" [label="1: Start struct_pass_by_value::X::X\nFormals:  this:struct_pass_by_value::X* __param_0:struct_pass_by_value::X&\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_1" -> "X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_3" ;
-"X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_2" [label="2: Exit struct_pass_by_value::X::X \n  " color=yellow style=filled]
+	 "X#X#struct_pass_by_value#{9877988472483132493|constexpr}.d7be6bdda4cd13032aaeffd34cab9cfa_1" -> "X#X#struct_pass_by_value#{9877988472483132493|constexpr}.d7be6bdda4cd13032aaeffd34cab9cfa_3" ;
+"X#X#struct_pass_by_value#{9877988472483132493|constexpr}.d7be6bdda4cd13032aaeffd34cab9cfa_2" [label="2: Exit struct_pass_by_value::X::X \n  " color=yellow style=filled]
 	
 
-"X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::X* [line 10, column 8]\n " shape="box"]
+"X#X#struct_pass_by_value#{9877988472483132493|constexpr}.d7be6bdda4cd13032aaeffd34cab9cfa_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::X* [line 10, column 8]\n " shape="box"]
 	
 
-	 "X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_3" -> "X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_4" ;
-"X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_pass_by_value::X const & [line 10, column 8]\n  n$3=*n$2.f:int [line 10, column 8]\n  *n$1.f:int=n$3 [line 10, column 8]\n " shape="box"]
+	 "X#X#struct_pass_by_value#{9877988472483132493|constexpr}.d7be6bdda4cd13032aaeffd34cab9cfa_3" -> "X#X#struct_pass_by_value#{9877988472483132493|constexpr}.d7be6bdda4cd13032aaeffd34cab9cfa_4" ;
+"X#X#struct_pass_by_value#{9877988472483132493|constexpr}.d7be6bdda4cd13032aaeffd34cab9cfa_4" [label="4:  Constructor Init \n   n$2=*&__param_0:struct_pass_by_value::X& [line 10, column 8]\n  n$3=*n$2.f:int [line 10, column 8]\n  *n$1.f:int=n$3 [line 10, column 8]\n " shape="box"]
 	
 
-	 "X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_4" -> "X#X#struct_pass_by_value#{9755652315089766298|constexpr}.81acc1c263466d84e0cc912cd1d47b28_2" ;
-"Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_1" [label="1: Start struct_pass_by_value::Y::Y\nFormals:  this:struct_pass_by_value::Y* x:struct_pass_by_value::X const &\nLocals:  \n  " color=yellow style=filled]
+	 "X#X#struct_pass_by_value#{9877988472483132493|constexpr}.d7be6bdda4cd13032aaeffd34cab9cfa_4" -> "X#X#struct_pass_by_value#{9877988472483132493|constexpr}.d7be6bdda4cd13032aaeffd34cab9cfa_2" ;
+"Y#Y#struct_pass_by_value#{6277034357330223368}.2f8fb67b7b76eaffc31110d1cedb2cc9_1" [label="1: Start struct_pass_by_value::Y::Y\nFormals:  this:struct_pass_by_value::Y* x:struct_pass_by_value::X const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_1" -> "Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_3" ;
-"Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_2" [label="2: Exit struct_pass_by_value::Y::Y \n  " color=yellow style=filled]
+	 "Y#Y#struct_pass_by_value#{6277034357330223368}.2f8fb67b7b76eaffc31110d1cedb2cc9_1" -> "Y#Y#struct_pass_by_value#{6277034357330223368}.2f8fb67b7b76eaffc31110d1cedb2cc9_3" ;
+"Y#Y#struct_pass_by_value#{6277034357330223368}.2f8fb67b7b76eaffc31110d1cedb2cc9_2" [label="2: Exit struct_pass_by_value::Y::Y \n  " color=yellow style=filled]
 	
 
-"Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::Y* [line 16, column 19]\n " shape="box"]
+"Y#Y#struct_pass_by_value#{6277034357330223368}.2f8fb67b7b76eaffc31110d1cedb2cc9_3" [label="3:  Constructor Init \n   n$1=*&this:struct_pass_by_value::Y* [line 16, column 19]\n " shape="box"]
 	
 
-	 "Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_3" -> "Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_4" ;
-"Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_4" [label="4:  Constructor Init \n   n$2=*&x:struct_pass_by_value::X const & [line 16, column 21]\n  n$3=_fun_struct_pass_by_value::X::X(n$1.x:struct_pass_by_value::X*,n$2:struct_pass_by_value::X const &) [line 16, column 19]\n " shape="box"]
+	 "Y#Y#struct_pass_by_value#{6277034357330223368}.2f8fb67b7b76eaffc31110d1cedb2cc9_3" -> "Y#Y#struct_pass_by_value#{6277034357330223368}.2f8fb67b7b76eaffc31110d1cedb2cc9_4" ;
+"Y#Y#struct_pass_by_value#{6277034357330223368}.2f8fb67b7b76eaffc31110d1cedb2cc9_4" [label="4:  Constructor Init \n   n$2=*&x:struct_pass_by_value::X const & [line 16, column 21]\n  n$3=_fun_struct_pass_by_value::X::X(n$1.x:struct_pass_by_value::X*,n$2:struct_pass_by_value::X const &) [line 16, column 19]\n " shape="box"]
 	
 
-	 "Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_4" -> "Y#Y#struct_pass_by_value#{2591422873810003675}.4cc6400ed3a8bedc19c95b6ea1876631_2" ;
+	 "Y#Y#struct_pass_by_value#{6277034357330223368}.2f8fb67b7b76eaffc31110d1cedb2cc9_4" -> "Y#Y#struct_pass_by_value#{6277034357330223368}.2f8fb67b7b76eaffc31110d1cedb2cc9_2" ;
 }
diff --git a/infer/tests/codetoanalyze/objcpp/frontend/global_const/global_const.mm.dot b/infer/tests/codetoanalyze/objcpp/frontend/global_const/global_const.mm.dot
index 25cb14e03..0c7e58697 100644
--- a/infer/tests/codetoanalyze/objcpp/frontend/global_const/global_const.mm.dot
+++ b/infer/tests/codetoanalyze/objcpp/frontend/global_const/global_const.mm.dot
@@ -30,35 +30,35 @@ digraph cfg {
 	
 
 	 "fields(class Fields)#3037629886785813687.ade89225d198ce505301d5cdffda48f1_5" -> "fields(class Fields)#3037629886785813687.ade89225d198ce505301d5cdffda48f1_2" ;
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_1" [label="1: Start Fields::\nFormals:  this:Fields* __param_0:Fields const &\nLocals:  \n  " color=yellow style=filled]
+"#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_1" [label="1: Start Fields::\nFormals:  this:Fields* __param_0:Fields const &\nLocals:  \n  " color=yellow style=filled]
 	
 
-	 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_1" -> "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_7" ;
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_2" [label="2: Exit Fields:: \n  " color=yellow style=filled]
+	 "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_1" -> "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_7" ;
+"#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_2" [label="2: Exit Fields:: \n  " color=yellow style=filled]
 	
 
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_3" [label="3:  Constructor Init \n   n$1=*&this:Fields* [line 8, column 9]\n " shape="box"]
+"#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_3" [label="3:  Constructor Init \n   n$1=*&this:Fields* [line 8, column 9]\n " shape="box"]
 	
 
-	 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_3" -> "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_4" ;
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Fields const & [line 8, column 9]\n  n$3=*n$2.field3:float [line 8, column 9]\n  *n$1.field3:float=n$3 [line 8, column 9]\n " shape="box"]
+	 "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_3" -> "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_4" ;
+"#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_4" [label="4:  Constructor Init \n   n$2=*&__param_0:Fields const & [line 8, column 9]\n  n$3=*n$2.field3:float [line 8, column 9]\n  *n$1.field3:float=n$3 [line 8, column 9]\n " shape="box"]
 	
 
-	 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_4" -> "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_2" ;
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_5" [label="5:  Constructor Init \n   n$4=*&this:Fields* [line 8, column 9]\n " shape="box"]
+	 "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_4" -> "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_2" ;
+"#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_5" [label="5:  Constructor Init \n   n$4=*&this:Fields* [line 8, column 9]\n " shape="box"]
 	
 
-	 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_5" -> "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_6" ;
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_6" [label="6:  Constructor Init \n   n$5=*&__param_0:Fields const & [line 8, column 9]\n  n$6=*n$5.field2:float [line 8, column 9]\n  *n$4.field2:float=n$6 [line 8, column 9]\n " shape="box"]
+	 "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_5" -> "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_6" ;
+"#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_6" [label="6:  Constructor Init \n   n$5=*&__param_0:Fields const & [line 8, column 9]\n  n$6=*n$5.field2:float [line 8, column 9]\n  *n$4.field2:float=n$6 [line 8, column 9]\n " shape="box"]
 	
 
-	 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_6" -> "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_3" ;
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_7" [label="7:  Constructor Init \n   n$7=*&this:Fields* [line 8, column 9]\n " shape="box"]
+	 "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_6" -> "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_3" ;
+"#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_7" [label="7:  Constructor Init \n   n$7=*&this:Fields* [line 8, column 9]\n " shape="box"]
 	
 
-	 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_7" -> "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_8" ;
-"#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_8" [label="8:  Constructor Init \n   n$8=*&__param_0:Fields const & [line 8, column 9]\n  n$9=*n$8.field1:float [line 8, column 9]\n  *n$7.field1:float=n$9 [line 8, column 9]\n " shape="box"]
+	 "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_7" -> "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_8" ;
+"#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_8" [label="8:  Constructor Init \n   n$8=*&__param_0:Fields const & [line 8, column 9]\n  n$9=*n$8.field1:float [line 8, column 9]\n  *n$7.field1:float=n$9 [line 8, column 9]\n " shape="box"]
 	
 
-	 "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_8" -> "#Fields#{11740702837802970461|constexpr}.35c900b91f77169dcc7579a3ddf4fddf_5" ;
+	 "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_8" -> "#Fields#{16890255804685749094|constexpr}.e087573051591237fe6712897d502cf0_5" ;
 }