From e083d3f693108b1dcb8ca12cb86f420bd35284f6 Mon Sep 17 00:00:00 2001 From: Sungkeun Cho Date: Wed, 16 Oct 2024 02:16:20 -0700 Subject: [PATCH] [clang] Upgrade clang to 19.1.1 Summary: This diff upgrades the clang version to 19.1.1: https://github.com/llvm/llvm-project/releases/tag/llvmorg-19.1.1 - Amended pre-existing patches. - Removed not-supported functions in clang: `NamespaceDecl::isOriginalNamespace` and `UnresolvedLookupExpr::isOverloaded` - Used `object_getClass` instead of `isa` in objc models. - Some FNs are introduced in Inferbo, Cost/c++, and Biabduction/objc. NOTE: On macos laptop with arm, ninja should be used to build clang. Reviewed By: martintrojer Differential Revision: D64109640 fbshipit-source-id: ad61a0a061dcefec93feee5ddc047bd99a1081bb --- .../clang-ocaml/tests/clang_ast_main_test.exp | 8 +- .../tests/clang_ast_named_decl_printer.exp | 2 + facebook-clang-plugins/clang/setup.sh | 6 + .../clang/src/err_ret_local_block.patch | 12 +- .../clang/src/mangle_suppress_errors.patch | 30 +- .../clang/src/prepare_clang_src.sh | 4 +- .../libtooling/ASTExporter.h | 20 +- .../tests/BiniouASTExporter/Hello.m.exp | 129 +-- .../ObjCBridgeTransferTest.m.exp | 137 +-- .../tests/BiniouASTExporter/ObjCTest.m.exp | 155 ++-- .../available_expression.m.exp | 65 +- .../BiniouASTExporter/bind_temporary.cpp.exp | 63 +- .../BiniouASTExporter/c_attributes.c.exp | 49 +- .../tests/BiniouASTExporter/c_cast.cpp.exp | 49 +- .../BiniouASTExporter/class_template.cpp.exp | 141 ++- .../tests/BiniouASTExporter/comments.c.exp | 49 +- .../BiniouASTExporter/const_cast.cpp.exp | 65 +- .../BiniouASTExporter/dynamic_cast.cpp.exp | 113 +-- .../expr_with_cleanups.cpp.exp | 99 +-- .../tests/BiniouASTExporter/friend.cpp.exp | 113 +-- .../function_template.cpp.exp | 77 +- .../generic_selector_expression.c.exp | 49 +- .../BiniouASTExporter/inheritance.cpp.exp | 103 +-- .../inheriting_constructor.cpp.exp | 85 +- .../tests/BiniouASTExporter/lambda.cpp.exp | 175 ++-- .../materialize_temporary.cpp.exp | 49 +- .../BiniouASTExporter/namespace_decl.cpp.exp | 57 +- .../tests/BiniouASTExporter/new.cpp.exp | 618 +++++++------ .../BiniouASTExporter/no_except_expr.cpp.exp | 55 +- .../objcpp_template_unboxing.mm.exp | 67 +- .../tests/BiniouASTExporter/optional.m.exp | 69 +- .../sizeof_static_evaluation.cpp.exp | 48 +- .../tests/BiniouASTExporter/struct.cpp.exp | 69 +- .../template_instantiations.cpp.exp | 395 ++++----- .../tests/BiniouASTExporter/this.cpp.exp | 49 +- .../BiniouASTExporter/type_trait.cpp.exp | 87 +- .../unresolved_lookup.cpp.exp | 71 +- .../BiniouASTExporter/using_directive.cpp.exp | 49 +- .../BiniouASTExporter/virtual_bases.cpp.exp | 147 ++-- .../tests/JsonASTExporter/Hello.m.exp | 158 ++-- .../ObjCBridgeTransferTest.m.exp | 164 ++-- .../tests/JsonASTExporter/ObjCTest.m.exp | 192 ++-- .../JsonASTExporter/bind_temporary.cpp.exp | 78 +- .../tests/JsonASTExporter/c_attributes.c.exp | 64 +- .../tests/JsonASTExporter/c_cast.cpp.exp | 64 +- .../JsonASTExporter/class_template.cpp.exp | 177 ++-- .../tests/JsonASTExporter/comments.c.exp | 64 +- .../tests/JsonASTExporter/const_cast.cpp.exp | 80 +- .../JsonASTExporter/dynamic_cast.cpp.exp | 128 +-- .../expr_with_cleanups.cpp.exp | 120 +-- .../tests/JsonASTExporter/friend.cpp.exp | 148 ++-- .../JsonASTExporter/function_template.cpp.exp | 102 ++- .../tests/JsonASTExporter/inheritance.cpp.exp | 120 +-- .../inheriting_constructor.cpp.exp | 102 ++- .../tests/JsonASTExporter/lambda.cpp.exp | 212 ++--- .../materialize_temporary.cpp.exp | 64 +- .../JsonASTExporter/namespace_decl.cpp.exp | 75 +- .../tests/JsonASTExporter/new.cpp.exp | 832 +++++++++++------- .../JsonASTExporter/no_except_expr.cpp.exp | 74 +- .../objcpp_template_unboxing.mm.exp | 88 +- .../tests/JsonASTExporter/optional.m.exp | 92 +- .../sizeof_static_evaluation.cpp.exp | 63 +- .../tests/JsonASTExporter/struct.cpp.exp | 84 +- .../template_instantiations.cpp.exp | 450 +++++----- .../tests/JsonASTExporter/this.cpp.exp | 64 +- .../tests/JsonASTExporter/type_trait.cpp.exp | 106 +-- .../JsonASTExporter/unresolved_lookup.cpp.exp | 102 ++- .../JsonASTExporter/using_directive.cpp.exp | 64 +- .../JsonASTExporter/virtual_bases.cpp.exp | 164 ++-- .../tests/YojsonASTExporter/Hello.m.exp | 158 ++-- .../ObjCBridgeTransferTest.m.exp | 164 ++-- .../tests/YojsonASTExporter/ObjCTest.m.exp | 192 ++-- .../available_expression.m.exp | 82 +- .../YojsonASTExporter/bind_temporary.cpp.exp | 78 +- .../YojsonASTExporter/c_attributes.c.exp | 64 +- .../tests/YojsonASTExporter/c_cast.cpp.exp | 64 +- .../YojsonASTExporter/class_template.cpp.exp | 177 ++-- .../tests/YojsonASTExporter/comments.c.exp | 64 +- .../YojsonASTExporter/const_cast.cpp.exp | 80 +- .../YojsonASTExporter/dynamic_cast.cpp.exp | 128 +-- .../expr_with_cleanups.cpp.exp | 120 +-- .../tests/YojsonASTExporter/friend.cpp.exp | 148 ++-- .../function_template.cpp.exp | 102 ++- .../generic_selector_expression.c.exp | 64 +- .../YojsonASTExporter/inheritance.cpp.exp | 120 +-- .../inheriting_constructor.cpp.exp | 102 ++- .../tests/YojsonASTExporter/lambda.cpp.exp | 212 ++--- .../materialize_temporary.cpp.exp | 64 +- .../YojsonASTExporter/namespace_decl.cpp.exp | 75 +- .../tests/YojsonASTExporter/new.cpp.exp | 832 +++++++++++------- .../YojsonASTExporter/no_except_expr.cpp.exp | 74 +- .../objcpp_template_unboxing.mm.exp | 88 +- .../tests/YojsonASTExporter/optional.m.exp | 92 +- .../sizeof_static_evaluation.cpp.exp | 63 +- .../tests/YojsonASTExporter/struct.cpp.exp | 84 +- .../template_instantiations.cpp.exp | 450 +++++----- .../tests/YojsonASTExporter/this.cpp.exp | 64 +- .../YojsonASTExporter/type_trait.cpp.exp | 106 +-- .../unresolved_lookup.cpp.exp | 102 ++- .../YojsonASTExporter/using_directive.cpp.exp | 64 +- infer/models/objc/src/NSArray.m | 4 +- infer/models/objc/src/NSDictionary.m | 4 +- infer/models/objc/src/NSMutableArray.m | 14 +- infer/models/objc/src/NSMutableDictionary.m | 10 +- infer/src/clang/cTrans.ml | 8 +- .../codetoanalyze/cpp/biabduction/issues.exp | 8 +- .../cpp/bufferoverrun/issues.exp | 4 - .../cpp/bufferoverrun/smart_ptr.cpp | 8 +- .../cpp/performance-11/cost-issues.exp | 4 +- .../cpp/performance/cost-issues.exp | 4 +- .../codetoanalyze/cpp/performance/loops.cpp | 2 +- .../cpp/performance/string_test.cpp | 2 +- .../cpp/shared/methods/byvals.cpp.dot | 28 +- .../biabduction/global_const/global_const.m | 2 +- .../objc/biabduction/issues.exp-all | 2 - .../objc/biabduction/issues.exp-arc | 6 - .../objc/biabduction/npe/UpdateDict.m | 10 +- .../biabduction/npe/nil_in_array_literal.m | 4 +- 118 files changed, 6597 insertions(+), 5727 deletions(-) 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 01d24be9fb3..c46865537fb 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 @@ -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 +64 98 TranslationUnitDecl None:None:None None:None:None TypedefDecl None:None:None None:None:None TypedefDecl None:None:None None:None:None @@ -748,6 +748,12 @@ TranslationUnitDecl None:None:None None:None:None ParmVarDecl tests/new.cpp:34:12 tests/new.cpp:34:12 FunctionDecl tests/new.cpp:34:12 tests/new.cpp:34:12 ParmVarDecl tests/new.cpp:34:12 tests/new.cpp:34:12 + ParmVarDecl tests/new.cpp:34:12 tests/new.cpp:34:12 + FunctionDecl tests/new.cpp:34:12 tests/new.cpp:34:12 + ParmVarDecl tests/new.cpp:34:12 tests/new.cpp:34:12 + FunctionDecl tests/new.cpp:34:12 tests/new.cpp:34:12 + ParmVarDecl tests/new.cpp:34:12 tests/new.cpp:34:12 + ParmVarDecl tests/new.cpp:34:12 tests/new.cpp:34:12 FunctionDecl tests/new.cpp:38:1 tests/new.cpp:43:1 CompoundStmt DeclStmt diff --git a/facebook-clang-plugins/clang-ocaml/tests/clang_ast_named_decl_printer.exp b/facebook-clang-plugins/clang-ocaml/tests/clang_ast_named_decl_printer.exp index 31d6e986efd..57ea7c6f442 100644 --- a/facebook-clang-plugins/clang-ocaml/tests/clang_ast_named_decl_printer.exp +++ b/facebook-clang-plugins/clang-ocaml/tests/clang_ast_named_decl_printer.exp @@ -163,6 +163,8 @@ test operator new operator new[] operator delete +operator delete +operator delete[] operator delete[] test_c11 operator new diff --git a/facebook-clang-plugins/clang/setup.sh b/facebook-clang-plugins/clang/setup.sh index 13fd64013c3..f0f46908e55 100755 --- a/facebook-clang-plugins/clang/setup.sh +++ b/facebook-clang-plugins/clang/setup.sh @@ -17,6 +17,7 @@ CLANG_INSTALLED_VERSION_FILE="$SCRIPT_DIR/installed.version" PATCHELF=${PATCHELF:-patchelf} PLATFORM=$(uname) PLATFORM_ENV=${PLATFORM_ENV:-} +SANDCASTLE=${SANDCASTLE:-} STRIP=${STRIP:-strip} CMAKE=${CMAKE:-cmake} ZLIB=${ZLIB:-$CLANG_SRC} @@ -182,6 +183,11 @@ if [ "$PLATFORM" = "Darwin" ]; then -DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS $CMAKE_SHARED_LINKER_FLAGS" -DLLVM_BUILD_LLVM_DYLIB=ON ) + if [ -n "$SANDCASTLE" ]; then + CMAKE_ARGS+=( + -DCMAKE_OSX_ARCHITECTURES=arm64 + ) + fi else CMAKE_ARGS+=( -DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS $CMAKE_SHARED_LINKER_FLAGS -lstdc++ -fPIC" 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 1dd78dfd769..8af7454ff84 100644 --- a/facebook-clang-plugins/clang/src/err_ret_local_block.patch +++ b/facebook-clang-plugins/clang/src/err_ret_local_block.patch @@ -1,12 +1,12 @@ ---- a/llvm-project/clang/lib/Sema/SemaInit.cpp -+++ b/llvm-project/clang/lib/Sema/SemaInit.cpp -@@ -8282,7 +8282,9 @@ void Sema::checkInitializerLifetime(cons - << Entity.getType()->isReferenceType() << DRE->getDecl() +--- a/llvm-project/clang/lib/Sema/CheckExprLifetime.cpp ++++ b/llvm-project/clang/lib/Sema/CheckExprLifetime.cpp +@@ -1202,7 +1202,9 @@ static void checkExprLifetimeImpl(Sema & + << InitEntity->getType()->isReferenceType() << DRE->getDecl() << isa(DRE->getDecl()) << DiagRange; } else if (isa(L)) { -- Diag(DiagLoc, diag::err_ret_local_block) << DiagRange; +- SemaRef.Diag(DiagLoc, diag::err_ret_local_block) << DiagRange; + // Don't throw this error during Infer runs -+ // Diag(DiagLoc, diag::err_ret_local_block) << DiagRange; ++ // SemaRef.Diag(DiagLoc, diag::err_ret_local_block) << DiagRange; + return false; } else if (isa(L)) { // Don't warn when returning a label from a statement expression. diff --git a/facebook-clang-plugins/clang/src/mangle_suppress_errors.patch b/facebook-clang-plugins/clang/src/mangle_suppress_errors.patch index 6888e32a253..071b5e3e1ca 100644 --- a/facebook-clang-plugins/clang/src/mangle_suppress_errors.patch +++ b/facebook-clang-plugins/clang/src/mangle_suppress_errors.patch @@ -1,8 +1,8 @@ --- a/llvm-project/clang/lib/AST/ItaniumMangle.cpp +++ b/llvm-project/clang/lib/AST/ItaniumMangle.cpp -@@ -1239,10 +1239,7 @@ void CXXNameMangler::mangleFloatLiteral( +@@ -1240,10 +1240,7 @@ void CXXNameMangler::mangleFloatLiteral( } - + void CXXNameMangler::mangleFixedPointLiteral() { - DiagnosticsEngine &Diags = Context.getDiags(); - unsigned DiagID = Diags.getCustomDiagID( @@ -10,11 +10,11 @@ - Diags.Report(DiagID); + Out << "__unhandled_FixedPointLiteral"; } - + void CXXNameMangler::mangleNullPointer(QualType T) { -@@ -3812,11 +3809,7 @@ void CXXNameMangler::mangleNeonVectorTyp +@@ -3822,11 +3819,7 @@ void CXXNameMangler::mangleNeonVectorTyp } - + void CXXNameMangler::mangleNeonVectorType(const DependentVectorType *T) { - DiagnosticsEngine &Diags = Context.getDiags(); - unsigned DiagID = Diags.getCustomDiagID( @@ -23,9 +23,9 @@ - Diags.Report(T->getAttributeLoc(), DiagID); + Out << "__unhandled_NeonVectorType"; } - + static StringRef mangleAArch64VectorBase(const BuiltinType *EltType) { -@@ -3889,11 +3882,7 @@ void CXXNameMangler::mangleAArch64NeonVe +@@ -3899,11 +3892,7 @@ void CXXNameMangler::mangleAArch64NeonVe Out << TypeName.length() << TypeName; } void CXXNameMangler::mangleAArch64NeonVectorType(const DependentVectorType *T) { @@ -36,10 +36,10 @@ - Diags.Report(T->getAttributeLoc(), DiagID); + Out << "__unhandled_AArch64NeonVectorType"; } - + // The AArch64 ACLE specifies that fixed-length SVE vector and predicate types -@@ -3986,11 +3975,7 @@ void CXXNameMangler::mangleAArch64FixedS - +@@ -3996,11 +3985,7 @@ void CXXNameMangler::mangleAArch64FixedS + void CXXNameMangler::mangleAArch64FixedSveVectorType( const DependentVectorType *T) { - DiagnosticsEngine &Diags = Context.getDiags(); @@ -49,9 +49,9 @@ - Diags.Report(T->getAttributeLoc(), DiagID); + Out << "__unhandled_AArch64FixedSveVectorType"; } - + void CXXNameMangler::mangleRISCVFixedRVVVectorType(const VectorType *T) { -@@ -4747,12 +4732,7 @@ recurse: +@@ -4770,12 +4755,7 @@ recurse: { NotPrimaryExpr(); if (!NullOut) { @@ -65,7 +65,7 @@ return; } break; -@@ -4787,12 +4767,7 @@ recurse: +@@ -4810,12 +4790,7 @@ recurse: // Even gcc-4.5 doesn't mangle this. case Expr::BinaryConditionalOperatorClass: { NotPrimaryExpr(); @@ -78,8 +78,8 @@ + Out << "__unhandled_BinaryConditionalOperatorClass"; return; } - -@@ -5157,18 +5132,11 @@ recurse: + +@@ -5188,18 +5163,11 @@ recurse: return; } case UETT_VecStep: { diff --git a/facebook-clang-plugins/clang/src/prepare_clang_src.sh b/facebook-clang-plugins/clang/src/prepare_clang_src.sh index 3982b7c9575..2d026a06368 100755 --- a/facebook-clang-plugins/clang/src/prepare_clang_src.sh +++ b/facebook-clang-plugins/clang/src/prepare_clang_src.sh @@ -13,9 +13,9 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SHASUM=${SHASUM:-shasum -a 256} PATCH=${PATCH:-patch} -LLVM_VER="18.1.3" +LLVM_VER="19.1.1" LLVM_URL="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/llvm-project-${LLVM_VER}.src.tar.xz" -LLVM_SHA="2929f62d69dec0379e529eb632c40e15191e36f3bd58c2cb2df0413a0dc48651" +LLVM_SHA="d40e933e2a208ee142898f85d886423a217e991abbcd42dd8211f507c93e1266" LLVM_FILE="llvm-project.src.tar.xz" CLANG_PREBUILD_PATCHES=( "$SCRIPT_DIR/err_ret_local_block.patch" diff --git a/facebook-clang-plugins/libtooling/ASTExporter.h b/facebook-clang-plugins/libtooling/ASTExporter.h index a844365b03a..033b5b69ce1 100644 --- a/facebook-clang-plugins/libtooling/ASTExporter.h +++ b/facebook-clang-plugins/libtooling/ASTExporter.h @@ -1172,7 +1172,6 @@ int ASTExporter::NamespaceDeclTupleSize() { //@atd #define namespace_decl_tuple named_decl_tuple * decl_context_tuple * namespace_decl_info //@atd type namespace_decl_info = { //@atd ~is_inline : bool; -//@atd ?original_namespace : decl_ref option; //@atd } template void ASTExporter::VisitNamespaceDecl(const NamespaceDecl *D) { @@ -1180,14 +1179,9 @@ void ASTExporter::VisitNamespaceDecl(const NamespaceDecl *D) { VisitDeclContext(D); bool IsInline = D->isInline(); - bool IsOriginalNamespace = D->isOriginalNamespace(); - ObjectScope Scope(OF, 0 + IsInline + !IsOriginalNamespace); + ObjectScope Scope(OF, 0 + IsInline); OF.emitFlag("is_inline", IsInline); - if (!IsOriginalNamespace) { - OF.emitTag("original_namespace"); - dumpDeclRef(*D->getOriginalNamespace()); - } } template @@ -3450,7 +3444,6 @@ int ASTExporter::UnresolvedLookupExprTupleSize() { //@atd #define unresolved_lookup_expr_tuple overload_expr_tuple * unresolved_lookup_expr_info //@atd type unresolved_lookup_expr_info = { //@atd ~requires_ADL : bool; -//@atd ~is_overloaded : bool; //@atd ?naming_class : decl_ref option; //@atd } template @@ -3459,14 +3452,11 @@ void ASTExporter::VisitUnresolvedLookupExpr( VisitOverloadExpr(Node); bool RequiresADL = Node->requiresADL(); - bool IsOverloaded = Node->isOverloaded(); bool HasNamingClass = Node->getNamingClass(); - ObjectScope Scope( - OF, - 0 + RequiresADL + IsOverloaded + HasNamingClass); // not covered by tests + ObjectScope Scope(OF, + 0 + RequiresADL + HasNamingClass); // not covered by tests OF.emitFlag("requires_ADL", RequiresADL); - OF.emitFlag("is_overloaded", IsOverloaded); if (HasNamingClass) { OF.emitTag("naming_class"); dumpDeclRef(*Node->getNamingClass()); @@ -3856,7 +3846,7 @@ int ASTExporter::AtomicExprTupleSize() { //@atd } //@atd type atomic_expr_kind = [ #define ATOMIC_BUILTIN(ID, TYPE, ATTRS) //@atd | AO@@ID -#include +#include //@atd ] template void ASTExporter::VisitAtomicExpr(const AtomicExpr *Node) { @@ -3869,7 +3859,7 @@ void ASTExporter::VisitAtomicExpr(const AtomicExpr *Node) { case AtomicExpr::AO##ID: \ OF.emitSimpleVariant("AO" #ID); \ break; -#include +#include default: llvm_unreachable("Unknown atomic_expr_kind is given!"); } diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/Hello.m.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/Hello.m.exp index 935f49a50de..26147108fe0 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/Hello.m.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/Hello.m.exp @@ -1680,92 +1680,93 @@ <#22d546dd: ({ #d121c0bd: 205 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 206 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 207 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 208 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 209 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 210 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 211 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 212 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 213 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 214 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 215 }, { #c1127ea9: 104 })>, - <#22d546dd: ({ #d121c0bd: 216 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 217 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 218 }, <#f65b235f>)>, - <#d3d219f7: ({ #d121c0bd: 219 }, { #c1127ea9: 214 })>, - <#0098a8c5: ({ #d121c0bd: 220 }, { #fcd148e8: 212 })>, - <#2e3d736c: ({ #d121c0bd: 221 }, { #c1127ea9: 220 })>, - <#0098a8c5: ({ #d121c0bd: 222 }, { #fcd148e8: 213 })>, - <#2e3d736c: ({ #d121c0bd: 223 }, { #c1127ea9: 222 })>, - <#2374f4e7: ({ #d121c0bd: 224 }, 10)>, - <#d80cb60b: ({ #d121c0bd: 225 }, 226)>, - <#d3d219f7: ({ #d121c0bd: 227 }, { #c1127ea9: 56, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 228 }, { #c1127ea9: 162, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 229 }, { #c1127ea9: 162 })>, - <#d80cb60b: ({ #d121c0bd: 230 }, 231)>, + <#22d546dd: ({ #d121c0bd: 208 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 209 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 210 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 211 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 212 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 213 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 214 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 215 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 216 }, { #c1127ea9: 104 })>, + <#22d546dd: ({ #d121c0bd: 217 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 218 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 219 }, <#f65b235f>)>, + <#d3d219f7: ({ #d121c0bd: 220 }, { #c1127ea9: 215 })>, + <#0098a8c5: ({ #d121c0bd: 221 }, { #fcd148e8: 213 })>, + <#2e3d736c: ({ #d121c0bd: 222 }, { #c1127ea9: 221 })>, + <#0098a8c5: ({ #d121c0bd: 223 }, { #fcd148e8: 214 })>, + <#2e3d736c: ({ #d121c0bd: 224 }, { #c1127ea9: 223 })>, + <#2374f4e7: ({ #d121c0bd: 225 }, 10)>, + <#d80cb60b: ({ #d121c0bd: 226 }, 227)>, + <#d3d219f7: ({ #d121c0bd: 228 }, { #c1127ea9: 56, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 229 }, { #c1127ea9: 162, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 230 }, { #c1127ea9: 162 })>, + <#d80cb60b: ({ #d121c0bd: 231 }, 232)>, <#da0c5ecf: - ({ #d121c0bd: 232 }, - { #cd26765d: { #c1127ea9: 230 }, #11302019: 24 }, + ({ #d121c0bd: 233 }, + { #cd26765d: { #c1127ea9: 231 }, #11302019: 24 }, 1)>, - <#2374f4e7: ({ #d121c0bd: 233 }, 18)>, + <#2374f4e7: ({ #d121c0bd: 234 }, 18)>, <#19e1ef85: - ({ #d121c0bd: 7, #26f32be5: 221 }, - { #0b680f7d: { #c1127ea9: 221 }, #c3687459: 6 })>, + ({ #d121c0bd: 7, #26f32be5: 222 }, + { #0b680f7d: { #c1127ea9: 222 }, #c3687459: 6 })>, <#19e1ef85: - ({ #d121c0bd: 21, #26f32be5: 221 }, + ({ #d121c0bd: 21, #26f32be5: 222 }, { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 160 })>, <#19e1ef85: - ({ #d121c0bd: 9, #26f32be5: 223 }, - { #0b680f7d: { #c1127ea9: 223 }, #c3687459: 8 })>, + ({ #d121c0bd: 9, #26f32be5: 224 }, + { #0b680f7d: { #c1127ea9: 224 }, #c3687459: 8 })>, <#19e1ef85: - ({ #d121c0bd: 5, #26f32be5: 219 }, - { #0b680f7d: { #c1127ea9: 219 }, #c3687459: 4 })>, - <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 233 })>, - <#263b5f37: ({ #d121c0bd: 39, #26f32be5: 223 })>, + ({ #d121c0bd: 5, #26f32be5: 220 }, + { #0b680f7d: { #c1127ea9: 220 }, #c3687459: 4 })>, + <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 234 })>, + <#263b5f37: ({ #d121c0bd: 39, #26f32be5: 224 })>, <#19e1ef85: ({ #d121c0bd: 15, #26f32be5: 56 }, { #0b680f7d: { #c1127ea9: 56 }, #c3687459: 14 })>, <#263b5f37: ({ #d121c0bd: 43, #26f32be5: 56 })>, - <#263b5f37: ({ #d121c0bd: 45, #26f32be5: 219 })>, - <#2e3d736c: ({ #d121c0bd: 50 }, { #c1127ea9: 224 })>, - <#2374f4e7: ({ #d121c0bd: 234 }, 53)>, - <#2374f4e7: ({ #d121c0bd: 235 }, 59)>, + <#263b5f37: ({ #d121c0bd: 45, #26f32be5: 220 })>, + <#2e3d736c: ({ #d121c0bd: 50 }, { #c1127ea9: 225 })>, + <#2374f4e7: ({ #d121c0bd: 235 }, 53)>, + <#2374f4e7: ({ #d121c0bd: 236 }, 59)>, <#19e1ef85: ({ #d121c0bd: 17, #26f32be5: 84 }, { #0b680f7d: { #c1127ea9: 84 }, #c3687459: 16 })>, <#263b5f37: ({ #d121c0bd: 61, #26f32be5: 84 })>, - <#2e3d736c: ({ #d121c0bd: 63 }, { #c1127ea9: 235 })>, - <#2374f4e7: ({ #d121c0bd: 236 }, 65)>, - <#263b5f37: ({ #d121c0bd: 74, #26f32be5: 221 })>, - <#cd01b755: - ({ #d121c0bd: 237 }, - { #cd26765d: { #c1127ea9: 221 }, #11302019: 8 })>, + <#2e3d736c: ({ #d121c0bd: 63 }, { #c1127ea9: 236 })>, + <#2374f4e7: ({ #d121c0bd: 237 }, 65)>, + <#263b5f37: ({ #d121c0bd: 74, #26f32be5: 222 })>, <#cd01b755: ({ #d121c0bd: 238 }, - { #cd26765d: { #c1127ea9: 74, #ea1a680e: true }, #11302019: 8 })>, + { #cd26765d: { #c1127ea9: 222 }, #11302019: 8 })>, <#cd01b755: ({ #d121c0bd: 239 }, { #cd26765d: { #c1127ea9: 74, #ea1a680e: true }, #11302019: 8 })>, - <#d3d219f7: ({ #d121c0bd: 240 }, { #c1127ea9: 221, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 241 }, { #c1127ea9: 74, #ea1a680e: true })>, - <#2d935553: ({ #d121c0bd: 68, #26f32be5: 241 }, { #c1127ea9: 241 })>, - <#2e3d736c: ({ #d121c0bd: 77 }, { #c1127ea9: 236 })>, - <#2374f4e7: ({ #d121c0bd: 242 }, 79)>, - <#d3d219f7: ({ #d121c0bd: 243 }, { #c1127ea9: 221 })>, + <#cd01b755: + ({ #d121c0bd: 240 }, + { #cd26765d: { #c1127ea9: 74, #ea1a680e: true }, #11302019: 8 })>, + <#d3d219f7: ({ #d121c0bd: 241 }, { #c1127ea9: 222, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 242 }, { #c1127ea9: 74, #ea1a680e: true })>, + <#2d935553: ({ #d121c0bd: 68, #26f32be5: 242 }, { #c1127ea9: 242 })>, + <#2e3d736c: ({ #d121c0bd: 77 }, { #c1127ea9: 237 })>, + <#2374f4e7: ({ #d121c0bd: 243 }, 79)>, + <#d3d219f7: ({ #d121c0bd: 244 }, { #c1127ea9: 222 })>, <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 74 })>, - <#2e3d736c: ({ #d121c0bd: 90 }, { #c1127ea9: 242 })>, - <#2374f4e7: ({ #d121c0bd: 244 }, 92)>, + <#2e3d736c: ({ #d121c0bd: 90 }, { #c1127ea9: 243 })>, + <#2374f4e7: ({ #d121c0bd: 245 }, 92)>, <#26796f6a: - ({ #d121c0bd: 245 }, + ({ #d121c0bd: 246 }, { #f9c96be9: { #c1127ea9: 104 } }, { #08ec7593: [ { #c1127ea9: 63 } ] })>, <#26796f6a: - ({ #d121c0bd: 246 }, + ({ #d121c0bd: 247 }, { #f9c96be9: { #c1127ea9: 104 } }, { #08ec7593: [ { #c1127ea9: 63 } ] })>, <#26796f6a: - ({ #d121c0bd: 247 }, + ({ #d121c0bd: 248 }, { #f9c96be9: { #c1127ea9: 104 } }, - { #08ec7593: [ { #c1127ea9: 221 } ] })>, + { #08ec7593: [ { #c1127ea9: 222 } ] })>, <#26796f6a: ({ #d121c0bd: 96 }, { #f9c96be9: { #c1127ea9: 104 } }, @@ -1776,17 +1777,17 @@ ({ #d121c0bd: 128 }, { #cd26765d: { #c1127ea9: 162 }, #11302019: 1 }, 19)>, - <#d3d219f7: ({ #d121c0bd: 248 }, { #c1127ea9: 247 })>, + <#d3d219f7: ({ #d121c0bd: 249 }, { #c1127ea9: 248 })>, <#d3d219f7: ({ #d121c0bd: 124 }, { #c1127ea9: 96 })>, <#cd01b755: - ({ #d121c0bd: 249 }, - { #cd26765d: { #c1127ea9: 229 }, #11302019: 8 })>, - <#d3d219f7: ({ #d121c0bd: 250 }, { #c1127ea9: 229 })>, - <#2d935553: ({ #d121c0bd: 135, #26f32be5: 250 }, { #c1127ea9: 250 })>, + ({ #d121c0bd: 250 }, + { #cd26765d: { #c1127ea9: 230 }, #11302019: 8 })>, + <#d3d219f7: ({ #d121c0bd: 251 }, { #c1127ea9: 230 })>, + <#2d935553: ({ #d121c0bd: 135, #26f32be5: 251 }, { #c1127ea9: 251 })>, <#26796f6a: - ({ #d121c0bd: 251 }, + ({ #d121c0bd: 252 }, { #f9c96be9: { #c1127ea9: 56 } }, - { #08ec7593: [ { #c1127ea9: 56 }, { #c1127ea9: 250 } ] })>, + { #08ec7593: [ { #c1127ea9: 56 }, { #c1127ea9: 251 } ] })>, <#26796f6a: ({ #d121c0bd: 132 }, { #f9c96be9: { #c1127ea9: 56 } }, diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCBridgeTransferTest.m.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCBridgeTransferTest.m.exp index d07baeba99b..6885685703f 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCBridgeTransferTest.m.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCBridgeTransferTest.m.exp @@ -1323,111 +1323,112 @@ <#22d546dd: ({ #d121c0bd: 173 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 174 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 175 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 176 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 177 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 178 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 179 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 180 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 181 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 182 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 183 }, { #c1127ea9: 112 })>, - <#22d546dd: ({ #d121c0bd: 184 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 185 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 186 }, <#f65b235f>)>, - <#d3d219f7: ({ #d121c0bd: 187 }, { #c1127ea9: 182 })>, - <#0098a8c5: ({ #d121c0bd: 188 }, { #fcd148e8: 180 })>, - <#2e3d736c: ({ #d121c0bd: 189 }, { #c1127ea9: 188 })>, - <#0098a8c5: ({ #d121c0bd: 190 }, { #fcd148e8: 181 })>, - <#2e3d736c: ({ #d121c0bd: 191 }, { #c1127ea9: 190 })>, - <#2374f4e7: ({ #d121c0bd: 192 }, 10)>, - <#d80cb60b: ({ #d121c0bd: 193 }, 194)>, - <#d3d219f7: ({ #d121c0bd: 195 }, { #c1127ea9: 56, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 196 }, { #c1127ea9: 130, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 197 }, { #c1127ea9: 130 })>, - <#d80cb60b: ({ #d121c0bd: 198 }, 199)>, + <#22d546dd: ({ #d121c0bd: 176 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 177 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 178 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 179 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 180 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 181 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 182 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 183 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 184 }, { #c1127ea9: 112 })>, + <#22d546dd: ({ #d121c0bd: 185 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 186 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 187 }, <#f65b235f>)>, + <#d3d219f7: ({ #d121c0bd: 188 }, { #c1127ea9: 183 })>, + <#0098a8c5: ({ #d121c0bd: 189 }, { #fcd148e8: 181 })>, + <#2e3d736c: ({ #d121c0bd: 190 }, { #c1127ea9: 189 })>, + <#0098a8c5: ({ #d121c0bd: 191 }, { #fcd148e8: 182 })>, + <#2e3d736c: ({ #d121c0bd: 192 }, { #c1127ea9: 191 })>, + <#2374f4e7: ({ #d121c0bd: 193 }, 10)>, + <#d80cb60b: ({ #d121c0bd: 194 }, 195)>, + <#d3d219f7: ({ #d121c0bd: 196 }, { #c1127ea9: 56, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 197 }, { #c1127ea9: 130, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 198 }, { #c1127ea9: 130 })>, + <#d80cb60b: ({ #d121c0bd: 199 }, 200)>, <#da0c5ecf: - ({ #d121c0bd: 200 }, - { #cd26765d: { #c1127ea9: 198 }, #11302019: 24 }, + ({ #d121c0bd: 201 }, + { #cd26765d: { #c1127ea9: 199 }, #11302019: 24 }, 1)>, - <#2374f4e7: ({ #d121c0bd: 201 }, 18)>, + <#2374f4e7: ({ #d121c0bd: 202 }, 18)>, <#19e1ef85: - ({ #d121c0bd: 7, #26f32be5: 189 }, - { #0b680f7d: { #c1127ea9: 189 }, #c3687459: 6 })>, + ({ #d121c0bd: 7, #26f32be5: 190 }, + { #0b680f7d: { #c1127ea9: 190 }, #c3687459: 6 })>, <#19e1ef85: - ({ #d121c0bd: 21, #26f32be5: 189 }, + ({ #d121c0bd: 21, #26f32be5: 190 }, { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 128 })>, <#19e1ef85: - ({ #d121c0bd: 9, #26f32be5: 191 }, - { #0b680f7d: { #c1127ea9: 191 }, #c3687459: 8 })>, + ({ #d121c0bd: 9, #26f32be5: 192 }, + { #0b680f7d: { #c1127ea9: 192 }, #c3687459: 8 })>, <#19e1ef85: - ({ #d121c0bd: 5, #26f32be5: 187 }, - { #0b680f7d: { #c1127ea9: 187 }, #c3687459: 4 })>, - <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 201 })>, - <#263b5f37: ({ #d121c0bd: 39, #26f32be5: 191 })>, + ({ #d121c0bd: 5, #26f32be5: 188 }, + { #0b680f7d: { #c1127ea9: 188 }, #c3687459: 4 })>, + <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 202 })>, + <#263b5f37: ({ #d121c0bd: 39, #26f32be5: 192 })>, <#19e1ef85: ({ #d121c0bd: 15, #26f32be5: 56 }, { #0b680f7d: { #c1127ea9: 56 }, #c3687459: 14 })>, <#263b5f37: ({ #d121c0bd: 43, #26f32be5: 56 })>, - <#263b5f37: ({ #d121c0bd: 45, #26f32be5: 187 })>, - <#2e3d736c: ({ #d121c0bd: 50 }, { #c1127ea9: 192 })>, - <#2374f4e7: ({ #d121c0bd: 202 }, 53)>, - <#2374f4e7: ({ #d121c0bd: 203 }, 59)>, + <#263b5f37: ({ #d121c0bd: 45, #26f32be5: 188 })>, + <#2e3d736c: ({ #d121c0bd: 50 }, { #c1127ea9: 193 })>, + <#2374f4e7: ({ #d121c0bd: 203 }, 53)>, + <#2374f4e7: ({ #d121c0bd: 204 }, 59)>, <#19e1ef85: ({ #d121c0bd: 17, #26f32be5: 84 }, { #0b680f7d: { #c1127ea9: 84 }, #c3687459: 16 })>, <#263b5f37: ({ #d121c0bd: 61, #26f32be5: 84 })>, - <#2e3d736c: ({ #d121c0bd: 63 }, { #c1127ea9: 203 })>, - <#2374f4e7: ({ #d121c0bd: 204 }, 65)>, - <#263b5f37: ({ #d121c0bd: 74, #26f32be5: 189 })>, - <#cd01b755: - ({ #d121c0bd: 205 }, - { #cd26765d: { #c1127ea9: 189 }, #11302019: 8 })>, + <#2e3d736c: ({ #d121c0bd: 63 }, { #c1127ea9: 204 })>, + <#2374f4e7: ({ #d121c0bd: 205 }, 65)>, + <#263b5f37: ({ #d121c0bd: 74, #26f32be5: 190 })>, <#cd01b755: ({ #d121c0bd: 206 }, - { #cd26765d: { #c1127ea9: 74, #ea1a680e: true }, #11302019: 8 })>, + { #cd26765d: { #c1127ea9: 190 }, #11302019: 8 })>, <#cd01b755: ({ #d121c0bd: 207 }, { #cd26765d: { #c1127ea9: 74, #ea1a680e: true }, #11302019: 8 })>, - <#d3d219f7: ({ #d121c0bd: 208 }, { #c1127ea9: 189, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 209 }, { #c1127ea9: 74, #ea1a680e: true })>, - <#2d935553: ({ #d121c0bd: 68, #26f32be5: 209 }, { #c1127ea9: 209 })>, - <#2e3d736c: ({ #d121c0bd: 77 }, { #c1127ea9: 204 })>, - <#2374f4e7: ({ #d121c0bd: 210 }, 79)>, - <#d3d219f7: ({ #d121c0bd: 211 }, { #c1127ea9: 189 })>, + <#cd01b755: + ({ #d121c0bd: 208 }, + { #cd26765d: { #c1127ea9: 74, #ea1a680e: true }, #11302019: 8 })>, + <#d3d219f7: ({ #d121c0bd: 209 }, { #c1127ea9: 190, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 210 }, { #c1127ea9: 74, #ea1a680e: true })>, + <#2d935553: ({ #d121c0bd: 68, #26f32be5: 210 }, { #c1127ea9: 210 })>, + <#2e3d736c: ({ #d121c0bd: 77 }, { #c1127ea9: 205 })>, + <#2374f4e7: ({ #d121c0bd: 211 }, 79)>, + <#d3d219f7: ({ #d121c0bd: 212 }, { #c1127ea9: 190 })>, <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 74 })>, - <#2e3d736c: ({ #d121c0bd: 90 }, { #c1127ea9: 210 })>, - <#2374f4e7: ({ #d121c0bd: 212 }, 92)>, + <#2e3d736c: ({ #d121c0bd: 90 }, { #c1127ea9: 211 })>, + <#2374f4e7: ({ #d121c0bd: 213 }, 92)>, <#26796f6a: - ({ #d121c0bd: 213 }, + ({ #d121c0bd: 214 }, { #f9c96be9: { #c1127ea9: 112 } }, { #08ec7593: [ { #c1127ea9: 63 } ] })>, <#26796f6a: - ({ #d121c0bd: 214 }, + ({ #d121c0bd: 215 }, { #f9c96be9: { #c1127ea9: 112 } }, { #08ec7593: [ { #c1127ea9: 63 } ] })>, <#26796f6a: - ({ #d121c0bd: 215 }, + ({ #d121c0bd: 216 }, { #f9c96be9: { #c1127ea9: 112 } }, - { #08ec7593: [ { #c1127ea9: 189 } ] })>, + { #08ec7593: [ { #c1127ea9: 190 } ] })>, <#26796f6a: ({ #d121c0bd: 96 }, { #f9c96be9: { #c1127ea9: 112 } }, { #08ec7593: [ { #c1127ea9: 7 } ] })>, <#d80cb60b: ({ #d121c0bd: 103 }, 102)>, - <#263b5f37: ({ #d121c0bd: 216, #26f32be5: 103 })>, - <#2374f4e7: ({ #d121c0bd: 217 }, 106)>, + <#263b5f37: ({ #d121c0bd: 217, #26f32be5: 103 })>, + <#2374f4e7: ({ #d121c0bd: 218 }, 106)>, <#19e1ef85: ({ #d121c0bd: 105, #26f32be5: 103 }, - { #0b680f7d: { #c1127ea9: 216 }, #c3687459: 104 })>, - <#263b5f37: ({ #d121c0bd: 218, #26f32be5: 103 })>, - <#d3d219f7: ({ #d121c0bd: 219 }, { #c1127ea9: 103 })>, - <#d3d219f7: ({ #d121c0bd: 125 }, { #c1127ea9: 218 })>, - <#01fe18e9: ({ #d121c0bd: 220 }, { #f9c96be9: { #c1127ea9: 219 } })>, + { #0b680f7d: { #c1127ea9: 217 }, #c3687459: 104 })>, + <#263b5f37: ({ #d121c0bd: 219, #26f32be5: 103 })>, + <#d3d219f7: ({ #d121c0bd: 220 }, { #c1127ea9: 103 })>, + <#d3d219f7: ({ #d121c0bd: 125 }, { #c1127ea9: 219 })>, + <#01fe18e9: ({ #d121c0bd: 221 }, { #f9c96be9: { #c1127ea9: 220 } })>, <#01fe18e9: ({ #d121c0bd: 108 }, { #f9c96be9: { #c1127ea9: 125 } })>, - <#2374f4e7: ({ #d121c0bd: 221 }, 109)>, - <#2e3d736c: ({ #d121c0bd: 114 }, { #c1127ea9: 221 })>, - <#2e3d736c: ({ #d121c0bd: 126 }, { #c1127ea9: 217 })>, - <#d3d219f7: ({ #d121c0bd: 222 }, { #c1127ea9: 220 })>, + <#2374f4e7: ({ #d121c0bd: 222 }, 109)>, + <#2e3d736c: ({ #d121c0bd: 114 }, { #c1127ea9: 222 })>, + <#2e3d736c: ({ #d121c0bd: 126 }, { #c1127ea9: 218 })>, + <#d3d219f7: ({ #d121c0bd: 223 }, { #c1127ea9: 221 })>, <#d3d219f7: ({ #d121c0bd: 124 }, { #c1127ea9: 108 })>, <#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 3d870aee656..1ccfea2907d 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCTest.m.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/ObjCTest.m.exp @@ -9715,100 +9715,101 @@ <#22d546dd: ({ #d121c0bd: 470 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 471 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 472 }, <#0d506118>)>, + <#22d546dd: ({ #d121c0bd: 473 }, <#f9ed64cb>)>, <#22d546dd: ({ #d121c0bd: 212 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 473 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 474 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 475 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 476 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 477 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 478 }, <#391b1e6e>)>, + <#22d546dd: ({ #d121c0bd: 474 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 475 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 476 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 477 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 478 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 479 }, <#391b1e6e>)>, <#d3d219f7: ({ #d121c0bd: 119 }, { #c1127ea9: 108 })>, - <#22d546dd: ({ #d121c0bd: 479 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 480 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 481 }, <#f65b235f>)>, - <#d3d219f7: ({ #d121c0bd: 482 }, { #c1127ea9: 478 })>, - <#0098a8c5: ({ #d121c0bd: 483 }, { #fcd148e8: 476 })>, - <#2e3d736c: ({ #d121c0bd: 484 }, { #c1127ea9: 483 })>, - <#0098a8c5: ({ #d121c0bd: 485 }, { #fcd148e8: 477 })>, - <#2e3d736c: ({ #d121c0bd: 486 }, { #c1127ea9: 485 })>, - <#2374f4e7: ({ #d121c0bd: 487 }, 10)>, - <#d80cb60b: ({ #d121c0bd: 488 }, 489)>, - <#d3d219f7: ({ #d121c0bd: 490 }, { #c1127ea9: 56, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 491 }, { #c1127ea9: 427, #ea1a680e: true })>, + <#22d546dd: ({ #d121c0bd: 480 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 481 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 482 }, <#f65b235f>)>, + <#d3d219f7: ({ #d121c0bd: 483 }, { #c1127ea9: 479 })>, + <#0098a8c5: ({ #d121c0bd: 484 }, { #fcd148e8: 477 })>, + <#2e3d736c: ({ #d121c0bd: 485 }, { #c1127ea9: 484 })>, + <#0098a8c5: ({ #d121c0bd: 486 }, { #fcd148e8: 478 })>, + <#2e3d736c: ({ #d121c0bd: 487 }, { #c1127ea9: 486 })>, + <#2374f4e7: ({ #d121c0bd: 488 }, 10)>, + <#d80cb60b: ({ #d121c0bd: 489 }, 490)>, + <#d3d219f7: ({ #d121c0bd: 491 }, { #c1127ea9: 56, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 492 }, { #c1127ea9: 427, #ea1a680e: true })>, <#d3d219f7: ({ #d121c0bd: 177 }, { #c1127ea9: 427 })>, - <#d80cb60b: ({ #d121c0bd: 492 }, 493)>, + <#d80cb60b: ({ #d121c0bd: 493 }, 494)>, <#da0c5ecf: - ({ #d121c0bd: 494 }, - { #cd26765d: { #c1127ea9: 492 }, #11302019: 24 }, + ({ #d121c0bd: 495 }, + { #cd26765d: { #c1127ea9: 493 }, #11302019: 24 }, 1)>, - <#2374f4e7: ({ #d121c0bd: 495 }, 18)>, + <#2374f4e7: ({ #d121c0bd: 496 }, 18)>, <#19e1ef85: - ({ #d121c0bd: 7, #26f32be5: 484 }, - { #0b680f7d: { #c1127ea9: 484 }, #c3687459: 6 })>, + ({ #d121c0bd: 7, #26f32be5: 485 }, + { #0b680f7d: { #c1127ea9: 485 }, #c3687459: 6 })>, <#19e1ef85: - ({ #d121c0bd: 21, #26f32be5: 484 }, + ({ #d121c0bd: 21, #26f32be5: 485 }, { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 425 })>, <#19e1ef85: - ({ #d121c0bd: 9, #26f32be5: 486 }, - { #0b680f7d: { #c1127ea9: 486 }, #c3687459: 8 })>, + ({ #d121c0bd: 9, #26f32be5: 487 }, + { #0b680f7d: { #c1127ea9: 487 }, #c3687459: 8 })>, <#19e1ef85: - ({ #d121c0bd: 5, #26f32be5: 482 }, - { #0b680f7d: { #c1127ea9: 482 }, #c3687459: 4 })>, - <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 495 })>, - <#263b5f37: ({ #d121c0bd: 39, #26f32be5: 486 })>, + ({ #d121c0bd: 5, #26f32be5: 483 }, + { #0b680f7d: { #c1127ea9: 483 }, #c3687459: 4 })>, + <#2e3d736c: ({ #d121c0bd: 30 }, { #c1127ea9: 496 })>, + <#263b5f37: ({ #d121c0bd: 39, #26f32be5: 487 })>, <#19e1ef85: ({ #d121c0bd: 15, #26f32be5: 56 }, { #0b680f7d: { #c1127ea9: 56 }, #c3687459: 14 })>, <#263b5f37: ({ #d121c0bd: 43, #26f32be5: 56 })>, - <#263b5f37: ({ #d121c0bd: 45, #26f32be5: 482 })>, - <#2e3d736c: ({ #d121c0bd: 50 }, { #c1127ea9: 487 })>, - <#2374f4e7: ({ #d121c0bd: 496 }, 53)>, - <#2374f4e7: ({ #d121c0bd: 497 }, 59)>, + <#263b5f37: ({ #d121c0bd: 45, #26f32be5: 483 })>, + <#2e3d736c: ({ #d121c0bd: 50 }, { #c1127ea9: 488 })>, + <#2374f4e7: ({ #d121c0bd: 497 }, 53)>, + <#2374f4e7: ({ #d121c0bd: 498 }, 59)>, <#19e1ef85: ({ #d121c0bd: 17, #26f32be5: 84 }, { #0b680f7d: { #c1127ea9: 84 }, #c3687459: 16 })>, <#263b5f37: ({ #d121c0bd: 61, #26f32be5: 84 })>, - <#2e3d736c: ({ #d121c0bd: 63 }, { #c1127ea9: 497 })>, - <#2374f4e7: ({ #d121c0bd: 498 }, 65)>, - <#263b5f37: ({ #d121c0bd: 74, #26f32be5: 484 })>, - <#cd01b755: - ({ #d121c0bd: 499 }, - { #cd26765d: { #c1127ea9: 484 }, #11302019: 8 })>, + <#2e3d736c: ({ #d121c0bd: 63 }, { #c1127ea9: 498 })>, + <#2374f4e7: ({ #d121c0bd: 499 }, 65)>, + <#263b5f37: ({ #d121c0bd: 74, #26f32be5: 485 })>, <#cd01b755: ({ #d121c0bd: 500 }, - { #cd26765d: { #c1127ea9: 74, #ea1a680e: true }, #11302019: 8 })>, + { #cd26765d: { #c1127ea9: 485 }, #11302019: 8 })>, <#cd01b755: ({ #d121c0bd: 501 }, { #cd26765d: { #c1127ea9: 74, #ea1a680e: true }, #11302019: 8 })>, - <#d3d219f7: ({ #d121c0bd: 502 }, { #c1127ea9: 484, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 503 }, { #c1127ea9: 74, #ea1a680e: true })>, - <#2d935553: ({ #d121c0bd: 68, #26f32be5: 503 }, { #c1127ea9: 503 })>, - <#2e3d736c: ({ #d121c0bd: 77 }, { #c1127ea9: 498 })>, - <#2374f4e7: ({ #d121c0bd: 504 }, 79)>, - <#d3d219f7: ({ #d121c0bd: 505 }, { #c1127ea9: 484 })>, + <#cd01b755: + ({ #d121c0bd: 502 }, + { #cd26765d: { #c1127ea9: 74, #ea1a680e: true }, #11302019: 8 })>, + <#d3d219f7: ({ #d121c0bd: 503 }, { #c1127ea9: 485, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 504 }, { #c1127ea9: 74, #ea1a680e: true })>, + <#2d935553: ({ #d121c0bd: 68, #26f32be5: 504 }, { #c1127ea9: 504 })>, + <#2e3d736c: ({ #d121c0bd: 77 }, { #c1127ea9: 499 })>, + <#2374f4e7: ({ #d121c0bd: 505 }, 79)>, + <#d3d219f7: ({ #d121c0bd: 506 }, { #c1127ea9: 485 })>, <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 74 })>, - <#2e3d736c: ({ #d121c0bd: 90 }, { #c1127ea9: 504 })>, - <#2374f4e7: ({ #d121c0bd: 506 }, 92)>, + <#2e3d736c: ({ #d121c0bd: 90 }, { #c1127ea9: 505 })>, + <#2374f4e7: ({ #d121c0bd: 507 }, 92)>, <#26796f6a: - ({ #d121c0bd: 507 }, + ({ #d121c0bd: 508 }, { #f9c96be9: { #c1127ea9: 108 } }, { #08ec7593: [ { #c1127ea9: 63 } ] })>, <#26796f6a: - ({ #d121c0bd: 508 }, + ({ #d121c0bd: 509 }, { #f9c96be9: { #c1127ea9: 108 } }, { #08ec7593: [ { #c1127ea9: 63 } ] })>, <#26796f6a: - ({ #d121c0bd: 509 }, + ({ #d121c0bd: 510 }, { #f9c96be9: { #c1127ea9: 108 } }, - { #08ec7593: [ { #c1127ea9: 484 } ] })>, + { #08ec7593: [ { #c1127ea9: 485 } ] })>, <#26796f6a: ({ #d121c0bd: 96 }, { #f9c96be9: { #c1127ea9: 108 } }, { #08ec7593: [ { #c1127ea9: 7 } ] })>, <#2374f4e7: ({ #d121c0bd: 413 }, 113)>, <#0098a8c5: - ({ #d121c0bd: 510 }, { #fcd148e8: 495, #0b037c51: [ 112 ] })>, - <#2e3d736c: ({ #d121c0bd: 128 }, { #c1127ea9: 510 })>, + ({ #d121c0bd: 511 }, { #fcd148e8: 496, #0b037c51: [ 112 ] })>, + <#2e3d736c: ({ #d121c0bd: 128 }, { #c1127ea9: 511 })>, <#2e3d736c: ({ #d121c0bd: 133 }, { #c1127ea9: 413 })>, <#ffc15fc2: ({ #d121c0bd: 158, #26f32be5: 63 }, { #3ed86e62: <#207783bf> })>, @@ -9816,36 +9817,36 @@ ({ #d121c0bd: 173 }, { #cd26765d: { #c1127ea9: 427 }, #11302019: 1 }, 4)>, - <#d3d219f7: ({ #d121c0bd: 511 }, { #c1127ea9: 56 })>, - <#d3d219f7: ({ #d121c0bd: 176 }, { #c1127ea9: 511 })>, - <#d3d219f7: ({ #d121c0bd: 512 }, { #c1127ea9: 509 })>, + <#d3d219f7: ({ #d121c0bd: 512 }, { #c1127ea9: 56 })>, + <#d3d219f7: ({ #d121c0bd: 176 }, { #c1127ea9: 512 })>, + <#d3d219f7: ({ #d121c0bd: 513 }, { #c1127ea9: 510 })>, <#d3d219f7: ({ #d121c0bd: 169 }, { #c1127ea9: 96 })>, <#26796f6a: - ({ #d121c0bd: 513 }, + ({ #d121c0bd: 514 }, { #f9c96be9: { #c1127ea9: 84 } }, { #08ec7593: [ { #c1127ea9: 63 } ] })>, <#26796f6a: - ({ #d121c0bd: 514 }, + ({ #d121c0bd: 515 }, { #f9c96be9: { #c1127ea9: 61 } }, { #08ec7593: [ { #c1127ea9: 63 } ] })>, - <#0c1e4fc4: ({ #d121c0bd: 515, #26f32be5: 514 }, { #c1127ea9: 514 })>, - <#e5fe99ea: ({ #d121c0bd: 516 }, { #c1127ea9: 513 })>, - <#e5fe99ea: ({ #d121c0bd: 224 }, { #c1127ea9: 515 })>, + <#0c1e4fc4: ({ #d121c0bd: 516, #26f32be5: 515 }, { #c1127ea9: 515 })>, + <#e5fe99ea: ({ #d121c0bd: 517 }, { #c1127ea9: 514 })>, + <#e5fe99ea: ({ #d121c0bd: 224 }, { #c1127ea9: 516 })>, <#26796f6a: - ({ #d121c0bd: 517 }, + ({ #d121c0bd: 518 }, { #f9c96be9: { #c1127ea9: 470 } }, { #08ec7593: [ { #c1127ea9: 63 } ] })>, <#26796f6a: - ({ #d121c0bd: 518 }, + ({ #d121c0bd: 519 }, { #f9c96be9: { #c1127ea9: 470 } }, { #08ec7593: [ { #c1127ea9: 63 } ] })>, - <#e5fe99ea: ({ #d121c0bd: 202 }, { #c1127ea9: 514 })>, - <#2e3d736c: ({ #d121c0bd: 235 }, { #c1127ea9: 496 })>, + <#e5fe99ea: ({ #d121c0bd: 202 }, { #c1127ea9: 515 })>, + <#2e3d736c: ({ #d121c0bd: 235 }, { #c1127ea9: 497 })>, <#da0c5ecf: ({ #d121c0bd: 281 }, { #cd26765d: { #c1127ea9: 427 }, #11302019: 1 }, 10)>, - <#2e3d736c: ({ #d121c0bd: 296 }, { #c1127ea9: 506 })>, + <#2e3d736c: ({ #d121c0bd: 296 }, { #c1127ea9: 507 })>, <#da0c5ecf: ({ #d121c0bd: 293 }, { #cd26765d: { #c1127ea9: 427 }, #11302019: 1 }, @@ -9858,15 +9859,15 @@ ({ #d121c0bd: 317 }, { #cd26765d: { #c1127ea9: 427 }, #11302019: 1 }, 7)>, - <#e1d903a1: ({ #d121c0bd: 519, #26f32be5: 484 })>, - <#2374f4e7: ({ #d121c0bd: 520 }, 372)>, - <#2374f4e7: ({ #d121c0bd: 521 }, 373)>, + <#e1d903a1: ({ #d121c0bd: 520, #26f32be5: 485 })>, + <#2374f4e7: ({ #d121c0bd: 521 }, 372)>, + <#2374f4e7: ({ #d121c0bd: 522 }, 373)>, <#0098a8c5: - ({ #d121c0bd: 522 }, - { #fcd148e8: 520, #25309442: [ { #c1127ea9: 30 } ] })>, - <#2e3d736c: ({ #d121c0bd: 377 }, { #c1127ea9: 522 })>, - <#2374f4e7: ({ #d121c0bd: 523 }, 380)>, - <#2e3d736c: ({ #d121c0bd: 385 }, { #c1127ea9: 523 })>, + ({ #d121c0bd: 523 }, + { #fcd148e8: 521, #25309442: [ { #c1127ea9: 30 } ] })>, + <#2e3d736c: ({ #d121c0bd: 377 }, { #c1127ea9: 523 })>, + <#2374f4e7: ({ #d121c0bd: 524 }, 380)>, + <#2e3d736c: ({ #d121c0bd: 385 }, { #c1127ea9: 524 })>, <#d3d219f7: ({ #d121c0bd: 403 }, { #c1127ea9: 177 })>, <#26796f6a: ({ #d121c0bd: 400 }, 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 0d8cd1498e0..6f9f553c13f 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/available_expression.m.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/available_expression.m.exp @@ -357,44 +357,45 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem <#22d546dd: ({ #d121c0bd: 79 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 80 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 81 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 82 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 83 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 84 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 85 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 86 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 87 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 88 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 18 })>, - <#22d546dd: ({ #d121c0bd: 90 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 91 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 92 }, <#f65b235f>)>, - <#d3d219f7: ({ #d121c0bd: 93 }, { #c1127ea9: 88 })>, - <#0098a8c5: ({ #d121c0bd: 94 }, { #fcd148e8: 86 })>, - <#2e3d736c: ({ #d121c0bd: 95 }, { #c1127ea9: 94 })>, - <#0098a8c5: ({ #d121c0bd: 96 }, { #fcd148e8: 87 })>, - <#2e3d736c: ({ #d121c0bd: 97 }, { #c1127ea9: 96 })>, - <#2374f4e7: ({ #d121c0bd: 98 }, 9)>, - <#d80cb60b: ({ #d121c0bd: 99 }, 100)>, - <#d3d219f7: ({ #d121c0bd: 101 }, { #c1127ea9: 20, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 102 }, { #c1127ea9: 35, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 35 })>, - <#d80cb60b: ({ #d121c0bd: 104 }, 105)>, + <#22d546dd: ({ #d121c0bd: 82 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 83 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 84 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 85 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 86 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 87 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 88 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 89 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 18 })>, + <#22d546dd: ({ #d121c0bd: 91 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 92 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 93 }, <#f65b235f>)>, + <#d3d219f7: ({ #d121c0bd: 94 }, { #c1127ea9: 89 })>, + <#0098a8c5: ({ #d121c0bd: 95 }, { #fcd148e8: 87 })>, + <#2e3d736c: ({ #d121c0bd: 96 }, { #c1127ea9: 95 })>, + <#0098a8c5: ({ #d121c0bd: 97 }, { #fcd148e8: 88 })>, + <#2e3d736c: ({ #d121c0bd: 98 }, { #c1127ea9: 97 })>, + <#2374f4e7: ({ #d121c0bd: 99 }, 9)>, + <#d80cb60b: ({ #d121c0bd: 100 }, 101)>, + <#d3d219f7: ({ #d121c0bd: 102 }, { #c1127ea9: 20, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 35, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 104 }, { #c1127ea9: 35 })>, + <#d80cb60b: ({ #d121c0bd: 105 }, 106)>, <#da0c5ecf: - ({ #d121c0bd: 106 }, - { #cd26765d: { #c1127ea9: 104 }, #11302019: 24 }, + ({ #d121c0bd: 107 }, + { #cd26765d: { #c1127ea9: 105 }, #11302019: 24 }, 1)>, - <#2374f4e7: ({ #d121c0bd: 107 }, 13)>, - <#2374f4e7: ({ #d121c0bd: 108 }, 15)>, - <#2e3d736c: ({ #d121c0bd: 22 }, { #c1127ea9: 108 })>, + <#2374f4e7: ({ #d121c0bd: 108 }, 13)>, + <#2374f4e7: ({ #d121c0bd: 109 }, 15)>, + <#2e3d736c: ({ #d121c0bd: 22 }, { #c1127ea9: 109 })>, <#19e1ef85: - ({ #d121c0bd: 7, #26f32be5: 95 }, - { #0b680f7d: { #c1127ea9: 95 }, #c3687459: 6 })>, + ({ #d121c0bd: 7, #26f32be5: 96 }, + { #0b680f7d: { #c1127ea9: 96 }, #c3687459: 6 })>, <#19e1ef85: - ({ #d121c0bd: 34, #26f32be5: 95 }, + ({ #d121c0bd: 34, #26f32be5: 96 }, { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 33 })>, <#19e1ef85: - ({ #d121c0bd: 5, #26f32be5: 93 }, - { #0b680f7d: { #c1127ea9: 93 }, #c3687459: 4 })>, + ({ #d121c0bd: 5, #26f32be5: 94 }, + { #0b680f7d: { #c1127ea9: 94 }, #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 6069abc0105..a22d4090f70 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/bind_temporary.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/bind_temporary.cpp.exp @@ -506,55 +506,56 @@ <#22d546dd: ({ #d121c0bd: 83 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 84 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 85 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 86 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 87 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 88 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 89 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 90 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 91 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 92 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 93 }, { #c1127ea9: 34 })>, - <#22d546dd: ({ #d121c0bd: 94 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 95 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 96 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 97 }, 98)>, - <#d3d219f7: ({ #d121c0bd: 99 }, { #c1127ea9: 39, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 100 }, { #c1127ea9: 36, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 101 }, { #c1127ea9: 36 })>, - <#d80cb60b: ({ #d121c0bd: 102 }, 103)>, + <#22d546dd: ({ #d121c0bd: 86 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 87 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 88 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 89 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 90 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 91 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 92 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 93 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 94 }, { #c1127ea9: 34 })>, + <#22d546dd: ({ #d121c0bd: 95 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 96 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 97 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 98 }, 99)>, + <#d3d219f7: ({ #d121c0bd: 100 }, { #c1127ea9: 39, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 101 }, { #c1127ea9: 36, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 102 }, { #c1127ea9: 36 })>, + <#d80cb60b: ({ #d121c0bd: 103 }, 104)>, <#da0c5ecf: - ({ #d121c0bd: 104 }, - { #cd26765d: { #c1127ea9: 102 }, #11302019: 24 }, + ({ #d121c0bd: 105 }, + { #cd26765d: { #c1127ea9: 103 }, #11302019: 24 }, 1)>, <#d80cb60b: ({ #d121c0bd: 8 }, 7)>, - <#d3d219f7: ({ #d121c0bd: 105 }, { #c1127ea9: 8 })>, + <#d3d219f7: ({ #d121c0bd: 106 }, { #c1127ea9: 8 })>, <#26796f6a: ({ #d121c0bd: 12 }, { #f9c96be9: { #c1127ea9: 34 } }, { })>, <#263b5f37: ({ #d121c0bd: 29, #26f32be5: 8 })>, <#26796f6a: - ({ #d121c0bd: 106 }, { #f9c96be9: { #c1127ea9: 34 } }, { })>, + ({ #d121c0bd: 107 }, { #f9c96be9: { #c1127ea9: 34 } }, { })>, <#26796f6a: ({ #d121c0bd: 15 }, { #f9c96be9: { #c1127ea9: 34 } }, { })>, - <#0b08cd60: ({ #d121c0bd: 107 }, { #c1127ea9: 8, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 108 }, { #c1127ea9: 8, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 20 }, { #c1127ea9: 29, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 108 }, + ({ #d121c0bd: 109 }, { #f9c96be9: { #c1127ea9: 34 } }, - { #08ec7593: [ { #c1127ea9: 107 } ] })>, + { #08ec7593: [ { #c1127ea9: 108 } ] })>, <#26796f6a: ({ #d121c0bd: 18 }, { #f9c96be9: { #c1127ea9: 34 } }, { #08ec7593: [ { #c1127ea9: 20 } ] })>, - <#d3d219f7: ({ #d121c0bd: 109 }, { #c1127ea9: 29 })>, - <#0b08cd60: ({ #d121c0bd: 110 }, { #c1127ea9: 8 })>, - <#0098a8c5: ({ #d121c0bd: 111 }, { #fcd148e8: 90 })>, - <#2e3d736c: ({ #d121c0bd: 112 }, { #c1127ea9: 111 })>, + <#d3d219f7: ({ #d121c0bd: 110 }, { #c1127ea9: 29 })>, + <#0b08cd60: ({ #d121c0bd: 111 }, { #c1127ea9: 8 })>, + <#0098a8c5: ({ #d121c0bd: 112 }, { #fcd148e8: 91 })>, + <#2e3d736c: ({ #d121c0bd: 113 }, { #c1127ea9: 112 })>, <#19e1ef85: - ({ #d121c0bd: 113, #26f32be5: 112 }, - { #0b680f7d: { #c1127ea9: 112 }, #c3687459: 114 })>, + ({ #d121c0bd: 114, #26f32be5: 113 }, + { #0b680f7d: { #c1127ea9: 113 }, #c3687459: 115 })>, <#19e1ef85: - ({ #d121c0bd: 33, #26f32be5: 112 }, - { #0b680f7d: { #c1127ea9: 113 }, #c3687459: 32 })>, + ({ #d121c0bd: 33, #26f32be5: 113 }, + { #0b680f7d: { #c1127ea9: 114 }, #c3687459: 32 })>, <#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 fa1e0aa845c..d86e3d8c026 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_attributes.c.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_attributes.c.exp @@ -138,38 +138,39 @@ <#22d546dd: ({ #d121c0bd: 60 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 61 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 62 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 63 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 64 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 65 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 66 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 67 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 68 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 69 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 70 }, { #c1127ea9: 14 })>, - <#22d546dd: ({ #d121c0bd: 71 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 72 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 73 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 74 }, 75)>, - <#d3d219f7: ({ #d121c0bd: 76 }, { #c1127ea9: 11, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 16, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 16 })>, - <#d80cb60b: ({ #d121c0bd: 79 }, 80)>, + <#22d546dd: ({ #d121c0bd: 63 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 64 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 65 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 66 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 67 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 68 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 69 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 70 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 71 }, { #c1127ea9: 14 })>, + <#22d546dd: ({ #d121c0bd: 72 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 73 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 74 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 75 }, 76)>, + <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 11, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 16, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 79 }, { #c1127ea9: 16 })>, + <#d80cb60b: ({ #d121c0bd: 80 }, 81)>, <#da0c5ecf: - ({ #d121c0bd: 81 }, - { #cd26765d: { #c1127ea9: 79 }, #11302019: 24 }, + ({ #d121c0bd: 82 }, + { #cd26765d: { #c1127ea9: 80 }, #11302019: 24 }, 1)>, <#26796f6a: ({ #d121c0bd: 9 }, { #f9c96be9: { #c1127ea9: 11 } }, { #08ec7593: [ { #c1127ea9: 11 } ] })>, - <#0098a8c5: ({ #d121c0bd: 82 }, { #fcd148e8: 67 })>, - <#2e3d736c: ({ #d121c0bd: 83 }, { #c1127ea9: 82 })>, + <#0098a8c5: ({ #d121c0bd: 83 }, { #fcd148e8: 68 })>, + <#2e3d736c: ({ #d121c0bd: 84 }, { #c1127ea9: 83 })>, <#19e1ef85: - ({ #d121c0bd: 84, #26f32be5: 83 }, - { #0b680f7d: { #c1127ea9: 83 }, #c3687459: 85 })>, + ({ #d121c0bd: 85, #26f32be5: 84 }, + { #0b680f7d: { #c1127ea9: 84 }, #c3687459: 86 })>, <#19e1ef85: - ({ #d121c0bd: 13, #26f32be5: 83 }, - { #0b680f7d: { #c1127ea9: 84 }, #c3687459: 12 })>, + ({ #d121c0bd: 13, #26f32be5: 84 }, + { #0b680f7d: { #c1127ea9: 85 }, #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 0263e079dd2..a77b78f737d 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_cast.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/c_cast.cpp.exp @@ -235,34 +235,35 @@ <#22d546dd: ({ #d121c0bd: 70 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 71 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 72 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 73 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 74 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 75 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 76 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 77 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 78 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 79 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 80 }, { #c1127ea9: 23 })>, - <#22d546dd: ({ #d121c0bd: 81 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 82 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 83 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 84 }, 85)>, - <#d3d219f7: ({ #d121c0bd: 86 }, { #c1127ea9: 8, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 87 }, { #c1127ea9: 25, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 25 })>, - <#d80cb60b: ({ #d121c0bd: 89 }, 90)>, + <#22d546dd: ({ #d121c0bd: 73 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 74 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 75 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 76 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 77 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 78 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 79 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 80 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 81 }, { #c1127ea9: 23 })>, + <#22d546dd: ({ #d121c0bd: 82 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 83 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 84 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 85 }, 86)>, + <#d3d219f7: ({ #d121c0bd: 87 }, { #c1127ea9: 8, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 25, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 25 })>, + <#d80cb60b: ({ #d121c0bd: 90 }, 91)>, <#da0c5ecf: - ({ #d121c0bd: 91 }, - { #cd26765d: { #c1127ea9: 89 }, #11302019: 24 }, + ({ #d121c0bd: 92 }, + { #cd26765d: { #c1127ea9: 90 }, #11302019: 24 }, 1)>, - <#0098a8c5: ({ #d121c0bd: 92 }, { #fcd148e8: 77 })>, - <#2e3d736c: ({ #d121c0bd: 93 }, { #c1127ea9: 92 })>, + <#0098a8c5: ({ #d121c0bd: 93 }, { #fcd148e8: 78 })>, + <#2e3d736c: ({ #d121c0bd: 94 }, { #c1127ea9: 93 })>, <#19e1ef85: - ({ #d121c0bd: 94, #26f32be5: 93 }, - { #0b680f7d: { #c1127ea9: 93 }, #c3687459: 95 })>, + ({ #d121c0bd: 95, #26f32be5: 94 }, + { #0b680f7d: { #c1127ea9: 94 }, #c3687459: 96 })>, <#19e1ef85: - ({ #d121c0bd: 22, #26f32be5: 93 }, - { #0b680f7d: { #c1127ea9: 94 }, #c3687459: 21 })>, + ({ #d121c0bd: 22, #26f32be5: 94 }, + { #0b680f7d: { #c1127ea9: 95 }, #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 7af66d0bd2a..5235487b6cb 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/class_template.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/class_template.cpp.exp @@ -1017,146 +1017,145 @@ <#22d546dd: ({ #d121c0bd: 134 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 135 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 136 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 137 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 138 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 139 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 140 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 141 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 142 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 143 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 144 }, { #c1127ea9: 86 })>, - <#22d546dd: ({ #d121c0bd: 145 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 146 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 147 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 148 }, 149)>, - <#d3d219f7: ({ #d121c0bd: 150 }, { #c1127ea9: 38, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 151 }, { #c1127ea9: 88, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 152 }, { #c1127ea9: 88 })>, - <#d80cb60b: ({ #d121c0bd: 153 }, 154)>, + <#22d546dd: ({ #d121c0bd: 137 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 138 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 139 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 140 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 141 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 142 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 143 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 144 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 145 }, { #c1127ea9: 86 })>, + <#22d546dd: ({ #d121c0bd: 146 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 147 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 148 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 149 }, 150)>, + <#d3d219f7: ({ #d121c0bd: 151 }, { #c1127ea9: 38, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 152 }, { #c1127ea9: 88, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 153 }, { #c1127ea9: 88 })>, + <#d80cb60b: ({ #d121c0bd: 154 }, 155)>, <#da0c5ecf: - ({ #d121c0bd: 155 }, - { #cd26765d: { #c1127ea9: 153 }, #11302019: 24 }, + ({ #d121c0bd: 156 }, + { #cd26765d: { #c1127ea9: 154 }, #11302019: 24 }, 1)>, - <#f3f3711a: ({ #d121c0bd: 156 })>, <#f3f3711a: ({ #d121c0bd: 157 })>, - <#ece2635f: ({ #d121c0bd: 158 })>, + <#f3f3711a: ({ #d121c0bd: 158 })>, <#ece2635f: ({ #d121c0bd: 159 })>, - <#d49f978d: ({ #d121c0bd: 160 })>, + <#ece2635f: ({ #d121c0bd: 160 })>, + <#d49f978d: ({ #d121c0bd: 161 })>, <#f3f3711a: ({ #d121c0bd: 32 })>, - <#d3d219f7: ({ #d121c0bd: 33 }, { #c1127ea9: 156 })>, - <#d3d219f7: ({ #d121c0bd: 161 }, { #c1127ea9: 32 })>, - <#ece2635f: ({ #d121c0bd: 162 })>, + <#d3d219f7: ({ #d121c0bd: 33 }, { #c1127ea9: 157 })>, + <#d3d219f7: ({ #d121c0bd: 162 }, { #c1127ea9: 32 })>, <#ece2635f: ({ #d121c0bd: 163 })>, - <#d49f978d: ({ #d121c0bd: 29 })>, <#ece2635f: ({ #d121c0bd: 164 })>, + <#d49f978d: ({ #d121c0bd: 29 })>, <#d80cb60b: ({ #d121c0bd: 35 }, 34)>, <#ece2635f: ({ #d121c0bd: 165, #26f32be5: 35 })>, - <#ece2635f: ({ #d121c0bd: 166, #26f32be5: 35 })>, <#263b5f37: ({ #d121c0bd: 70, #26f32be5: 35 })>, <#26796f6a: - ({ #d121c0bd: 167 }, + ({ #d121c0bd: 166 }, { #f9c96be9: { #c1127ea9: 86 } }, { #08ec7593: [ { #c1127ea9: 35 } ] })>, <#26796f6a: ({ #d121c0bd: 68 }, { #f9c96be9: { #c1127ea9: 86 } }, { #08ec7593: [ { #c1127ea9: 70 } ] })>, - <#ece2635f: ({ #d121c0bd: 168, #26f32be5: 35 })>, - <#263b5f37: ({ #d121c0bd: 169, #26f32be5: 35 })>, + <#ece2635f: ({ #d121c0bd: 167, #26f32be5: 35 })>, + <#263b5f37: ({ #d121c0bd: 168, #26f32be5: 35 })>, <#d3d219f7: ({ #d121c0bd: 27 }, { #c1127ea9: 35 })>, - <#d3d219f7: ({ #d121c0bd: 170 }, { #c1127ea9: 169 })>, + <#d3d219f7: ({ #d121c0bd: 169 }, { #c1127ea9: 168 })>, <#d80cb60b: ({ #d121c0bd: 10 }, 9)>, - <#ece2635f: ({ #d121c0bd: 171, #26f32be5: 10 })>, + <#ece2635f: ({ #d121c0bd: 170, #26f32be5: 10 })>, <#263b5f37: ({ #d121c0bd: 74, #26f32be5: 10 })>, <#dd64b59b: ({ #d121c0bd: 13, #26f32be5: 35 })>, + <#26796f6a: + ({ #d121c0bd: 171 }, { #f9c96be9: { #c1127ea9: 86 } }, { })>, <#26796f6a: ({ #d121c0bd: 172 }, { #f9c96be9: { #c1127ea9: 86 } }, { })>, <#26796f6a: ({ #d121c0bd: 173 }, { #f9c96be9: { #c1127ea9: 86 } }, { })>, - <#26796f6a: - ({ #d121c0bd: 174 }, { #f9c96be9: { #c1127ea9: 86 } }, { })>, <#26796f6a: ({ #d121c0bd: 41 }, { #f9c96be9: { #c1127ea9: 86 } }, { })>, - <#263b5f37: ({ #d121c0bd: 175, #26f32be5: 10 })>, - <#0b08cd60: ({ #d121c0bd: 176 }, { #c1127ea9: 10, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 22 }, { #c1127ea9: 175, #ea1a680e: true })>, + <#263b5f37: ({ #d121c0bd: 174, #26f32be5: 10 })>, + <#0b08cd60: ({ #d121c0bd: 175 }, { #c1127ea9: 10, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 22 }, { #c1127ea9: 174, #ea1a680e: true })>, <#263b5f37: ({ #d121c0bd: 60, #26f32be5: 35 })>, - <#0b08cd60: ({ #d121c0bd: 177 }, { #c1127ea9: 35, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 176 }, { #c1127ea9: 35, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 45 }, { #c1127ea9: 60, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 178 }, + ({ #d121c0bd: 177 }, { #f9c96be9: { #c1127ea9: 86 } }, - { #08ec7593: [ { #c1127ea9: 177 } ] })>, + { #08ec7593: [ { #c1127ea9: 176 } ] })>, <#26796f6a: ({ #d121c0bd: 43 }, { #f9c96be9: { #c1127ea9: 86 } }, { #08ec7593: [ { #c1127ea9: 45 } ] })>, - <#295746e6: ({ #d121c0bd: 179 }, { #c1127ea9: 35 })>, + <#295746e6: ({ #d121c0bd: 178 }, { #c1127ea9: 35 })>, <#295746e6: ({ #d121c0bd: 49 }, { #c1127ea9: 60 })>, <#26796f6a: - ({ #d121c0bd: 180 }, + ({ #d121c0bd: 179 }, { #f9c96be9: { #c1127ea9: 86 } }, - { #08ec7593: [ { #c1127ea9: 179 } ] })>, + { #08ec7593: [ { #c1127ea9: 178 } ] })>, <#26796f6a: ({ #d121c0bd: 47 }, { #f9c96be9: { #c1127ea9: 86 } }, { #08ec7593: [ { #c1127ea9: 49 } ] })>, <#26796f6a: - ({ #d121c0bd: 181 }, + ({ #d121c0bd: 180 }, { #f9c96be9: { #c1127ea9: 86 } }, - { #08ec7593: [ { #c1127ea9: 176 } ] })>, + { #08ec7593: [ { #c1127ea9: 175 } ] })>, <#26796f6a: ({ #d121c0bd: 20 }, { #f9c96be9: { #c1127ea9: 86 } }, { #08ec7593: [ { #c1127ea9: 22 } ] })>, - <#295746e6: ({ #d121c0bd: 182 }, { #c1127ea9: 10 })>, - <#295746e6: ({ #d121c0bd: 26 }, { #c1127ea9: 175 })>, + <#295746e6: ({ #d121c0bd: 181 }, { #c1127ea9: 10 })>, + <#295746e6: ({ #d121c0bd: 26 }, { #c1127ea9: 174 })>, <#26796f6a: - ({ #d121c0bd: 183 }, + ({ #d121c0bd: 182 }, { #f9c96be9: { #c1127ea9: 86 } }, - { #08ec7593: [ { #c1127ea9: 182 } ] })>, + { #08ec7593: [ { #c1127ea9: 181 } ] })>, <#26796f6a: ({ #d121c0bd: 24 }, { #f9c96be9: { #c1127ea9: 86 } }, { #08ec7593: [ { #c1127ea9: 26 } ] })>, <#26796f6a: ({ #d121c0bd: 15 }, { #f9c96be9: { #c1127ea9: 86 } }, { })>, - <#d3d219f7: ({ #d121c0bd: 184 }, { #c1127ea9: 13 })>, - <#0b08cd60: ({ #d121c0bd: 185 }, { #c1127ea9: 35 })>, - <#d3d219f7: ({ #d121c0bd: 186 }, { #c1127ea9: 10 })>, - <#d3d219f7: ({ #d121c0bd: 187 }, { #c1127ea9: 74 })>, - <#0b08cd60: ({ #d121c0bd: 188 }, { #c1127ea9: 10 })>, - <#0b08cd60: ({ #d121c0bd: 189 }, { #c1127ea9: 60 })>, + <#d3d219f7: ({ #d121c0bd: 183 }, { #c1127ea9: 13 })>, + <#0b08cd60: ({ #d121c0bd: 184 }, { #c1127ea9: 35 })>, + <#d3d219f7: ({ #d121c0bd: 185 }, { #c1127ea9: 10 })>, + <#d3d219f7: ({ #d121c0bd: 186 }, { #c1127ea9: 74 })>, + <#0b08cd60: ({ #d121c0bd: 187 }, { #c1127ea9: 10 })>, + <#0b08cd60: ({ #d121c0bd: 188 }, { #c1127ea9: 60 })>, <#26796f6a: - ({ #d121c0bd: 190 }, - { #f9c96be9: { #c1127ea9: 185 } }, - { #08ec7593: [ { #c1127ea9: 177 } ] })>, + ({ #d121c0bd: 189 }, + { #f9c96be9: { #c1127ea9: 184 } }, + { #08ec7593: [ { #c1127ea9: 176 } ] })>, <#26796f6a: - ({ #d121c0bd: 191 }, - { #f9c96be9: { #c1127ea9: 189 } }, + ({ #d121c0bd: 190 }, + { #f9c96be9: { #c1127ea9: 188 } }, { #08ec7593: [ { #c1127ea9: 45 } ] })>, <#26796f6a: - ({ #d121c0bd: 192 }, - { #f9c96be9: { #c1127ea9: 185 } }, - { #08ec7593: [ { #c1127ea9: 179 } ] })>, + ({ #d121c0bd: 191 }, + { #f9c96be9: { #c1127ea9: 184 } }, + { #08ec7593: [ { #c1127ea9: 178 } ] })>, <#26796f6a: ({ #d121c0bd: 65 }, - { #f9c96be9: { #c1127ea9: 189 } }, + { #f9c96be9: { #c1127ea9: 188 } }, { #08ec7593: [ { #c1127ea9: 49 } ] })>, <#26796f6a: ({ #d121c0bd: 51 }, - { #f9c96be9: { #c1127ea9: 189 } }, + { #f9c96be9: { #c1127ea9: 188 } }, { #08ec7593: [ { #c1127ea9: 45 } ] })>, - <#d3d219f7: ({ #d121c0bd: 193 }, { #c1127ea9: 190 })>, + <#d3d219f7: ({ #d121c0bd: 192 }, { #c1127ea9: 189 })>, <#d3d219f7: ({ #d121c0bd: 79 }, { #c1127ea9: 51 })>, - <#0098a8c5: ({ #d121c0bd: 194 }, { #fcd148e8: 141 })>, - <#2e3d736c: ({ #d121c0bd: 195 }, { #c1127ea9: 194 })>, + <#0098a8c5: ({ #d121c0bd: 193 }, { #fcd148e8: 142 })>, + <#2e3d736c: ({ #d121c0bd: 194 }, { #c1127ea9: 193 })>, <#19e1ef85: - ({ #d121c0bd: 196, #26f32be5: 195 }, - { #0b680f7d: { #c1127ea9: 195 }, #c3687459: 197 })>, + ({ #d121c0bd: 195, #26f32be5: 194 }, + { #0b680f7d: { #c1127ea9: 194 }, #c3687459: 196 })>, <#19e1ef85: - ({ #d121c0bd: 85, #26f32be5: 195 }, - { #0b680f7d: { #c1127ea9: 196 }, #c3687459: 84 })>, + ({ #d121c0bd: 85, #26f32be5: 194 }, + { #0b680f7d: { #c1127ea9: 195 }, #c3687459: 84 })>, <#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 c911247d130..ce37a83aef4 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/comments.c.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/comments.c.exp @@ -124,35 +124,36 @@ <#22d546dd: ({ #d121c0bd: 59 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 60 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 61 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 62 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 63 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 64 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 65 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 66 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 67 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 68 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 69 }, { #c1127ea9: 12 })>, - <#22d546dd: ({ #d121c0bd: 70 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 71 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 72 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 73 }, 74)>, - <#d3d219f7: ({ #d121c0bd: 75 }, { #c1127ea9: 17, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 76 }, { #c1127ea9: 14, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 14 })>, - <#d80cb60b: ({ #d121c0bd: 78 }, 79)>, + <#22d546dd: ({ #d121c0bd: 62 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 63 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 64 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 65 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 66 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 67 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 68 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 69 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 70 }, { #c1127ea9: 12 })>, + <#22d546dd: ({ #d121c0bd: 71 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 72 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 73 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 74 }, 75)>, + <#d3d219f7: ({ #d121c0bd: 76 }, { #c1127ea9: 17, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 14, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 14 })>, + <#d80cb60b: ({ #d121c0bd: 79 }, 80)>, <#da0c5ecf: - ({ #d121c0bd: 80 }, - { #cd26765d: { #c1127ea9: 78 }, #11302019: 24 }, + ({ #d121c0bd: 81 }, + { #cd26765d: { #c1127ea9: 79 }, #11302019: 24 }, 1)>, <#01fe18e9: ({ #d121c0bd: 8 }, { #f9c96be9: { #c1127ea9: 12 } })>, - <#0098a8c5: ({ #d121c0bd: 81 }, { #fcd148e8: 66 })>, - <#2e3d736c: ({ #d121c0bd: 82 }, { #c1127ea9: 81 })>, + <#0098a8c5: ({ #d121c0bd: 82 }, { #fcd148e8: 67 })>, + <#2e3d736c: ({ #d121c0bd: 83 }, { #c1127ea9: 82 })>, <#19e1ef85: - ({ #d121c0bd: 83, #26f32be5: 82 }, - { #0b680f7d: { #c1127ea9: 82 }, #c3687459: 84 })>, + ({ #d121c0bd: 84, #26f32be5: 83 }, + { #0b680f7d: { #c1127ea9: 83 }, #c3687459: 85 })>, <#19e1ef85: - ({ #d121c0bd: 11, #26f32be5: 82 }, - { #0b680f7d: { #c1127ea9: 83 }, #c3687459: 10 })>, + ({ #d121c0bd: 11, #26f32be5: 83 }, + { #0b680f7d: { #c1127ea9: 84 }, #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 b4ca523bbb4..736d1154134 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/const_cast.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/const_cast.cpp.exp @@ -392,54 +392,55 @@ <#22d546dd: ({ #d121c0bd: 82 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 83 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 28 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 84 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 85 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 86 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 87 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 88 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 89 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 90 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 29 })>, - <#22d546dd: ({ #d121c0bd: 92 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 93 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 94 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 95 }, 96)>, - <#d3d219f7: ({ #d121c0bd: 97 }, { #c1127ea9: 31, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 98 }, { #c1127ea9: 36, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 99 }, { #c1127ea9: 36 })>, - <#d80cb60b: ({ #d121c0bd: 100 }, 101)>, + <#22d546dd: ({ #d121c0bd: 84 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 85 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 86 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 87 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 88 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 89 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 90 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 91 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 92 }, { #c1127ea9: 29 })>, + <#22d546dd: ({ #d121c0bd: 93 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 94 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 95 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 96 }, 97)>, + <#d3d219f7: ({ #d121c0bd: 98 }, { #c1127ea9: 31, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 99 }, { #c1127ea9: 36, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 100 }, { #c1127ea9: 36 })>, + <#d80cb60b: ({ #d121c0bd: 101 }, 102)>, <#da0c5ecf: - ({ #d121c0bd: 102 }, - { #cd26765d: { #c1127ea9: 100 }, #11302019: 24 }, + ({ #d121c0bd: 103 }, + { #cd26765d: { #c1127ea9: 101 }, #11302019: 24 }, 1)>, <#d80cb60b: ({ #d121c0bd: 8 }, 7)>, - <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 8 })>, + <#d3d219f7: ({ #d121c0bd: 104 }, { #c1127ea9: 8 })>, <#26796f6a: ({ #d121c0bd: 12 }, { #f9c96be9: { #c1127ea9: 29 } }, { })>, <#263b5f37: ({ #d121c0bd: 22, #26f32be5: 8 })>, - <#0b08cd60: ({ #d121c0bd: 104 }, { #c1127ea9: 8, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 105 }, { #c1127ea9: 8, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 17 }, { #c1127ea9: 22, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 105 }, + ({ #d121c0bd: 106 }, { #f9c96be9: { #c1127ea9: 29 } }, - { #08ec7593: [ { #c1127ea9: 104 } ] })>, + { #08ec7593: [ { #c1127ea9: 105 } ] })>, <#26796f6a: ({ #d121c0bd: 15 }, { #f9c96be9: { #c1127ea9: 29 } }, { #08ec7593: [ { #c1127ea9: 17 } ] })>, - <#0b08cd60: ({ #d121c0bd: 106 }, { #c1127ea9: 8 })>, + <#0b08cd60: ({ #d121c0bd: 107 }, { #c1127ea9: 8 })>, <#0b08cd60: ({ #d121c0bd: 23 }, { #c1127ea9: 22 })>, - <#d3d219f7: ({ #d121c0bd: 107 }, { #c1127ea9: 8, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 108 }, { #c1127ea9: 22, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 109 }, { #c1127ea9: 22 })>, - <#0098a8c5: ({ #d121c0bd: 110 }, { #fcd148e8: 88 })>, - <#2e3d736c: ({ #d121c0bd: 111 }, { #c1127ea9: 110 })>, + <#d3d219f7: ({ #d121c0bd: 108 }, { #c1127ea9: 8, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 109 }, { #c1127ea9: 22, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 110 }, { #c1127ea9: 22 })>, + <#0098a8c5: ({ #d121c0bd: 111 }, { #fcd148e8: 89 })>, + <#2e3d736c: ({ #d121c0bd: 112 }, { #c1127ea9: 111 })>, <#19e1ef85: - ({ #d121c0bd: 112, #26f32be5: 111 }, - { #0b680f7d: { #c1127ea9: 111 }, #c3687459: 113 })>, + ({ #d121c0bd: 113, #26f32be5: 112 }, + { #0b680f7d: { #c1127ea9: 112 }, #c3687459: 114 })>, <#19e1ef85: - ({ #d121c0bd: 34, #26f32be5: 111 }, - { #0b680f7d: { #c1127ea9: 112 }, #c3687459: 33 })>, + ({ #d121c0bd: 34, #26f32be5: 112 }, + { #0b680f7d: { #c1127ea9: 113 }, #c3687459: 33 })>, <#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 c87e5466abc..e3239b96801 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/dynamic_cast.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/dynamic_cast.cpp.exp @@ -1692,49 +1692,50 @@ <#22d546dd: ({ #d121c0bd: 163 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 164 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 165 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 166 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 167 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 168 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 169 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 170 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 171 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 172 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 173 }, { #c1127ea9: 114 })>, - <#22d546dd: ({ #d121c0bd: 174 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 175 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 176 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 177 }, 178)>, - <#d3d219f7: ({ #d121c0bd: 179 }, { #c1127ea9: 119, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 180 }, { #c1127ea9: 116, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 181 }, { #c1127ea9: 116 })>, - <#d80cb60b: ({ #d121c0bd: 182 }, 183)>, + <#22d546dd: ({ #d121c0bd: 166 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 167 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 168 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 169 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 170 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 171 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 172 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 173 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 174 }, { #c1127ea9: 114 })>, + <#22d546dd: ({ #d121c0bd: 175 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 176 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 177 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 178 }, 179)>, + <#d3d219f7: ({ #d121c0bd: 180 }, { #c1127ea9: 119, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 181 }, { #c1127ea9: 116, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 182 }, { #c1127ea9: 116 })>, + <#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: 11 }, { #f9c96be9: { #c1127ea9: 114 } }, { })>, <#263b5f37: ({ #d121c0bd: 47, #26f32be5: 8 })>, - <#0b08cd60: ({ #d121c0bd: 186 }, { #c1127ea9: 8 })>, + <#0b08cd60: ({ #d121c0bd: 187 }, { #c1127ea9: 8 })>, <#0b08cd60: ({ #d121c0bd: 95 }, { #c1127ea9: 47 })>, - <#0b08cd60: ({ #d121c0bd: 187 }, { #c1127ea9: 8, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 188 }, { #c1127ea9: 8, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 16 }, { #c1127ea9: 47, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 188 }, - { #f9c96be9: { #c1127ea9: 186 } }, - { #08ec7593: [ { #c1127ea9: 187 } ] })>, + ({ #d121c0bd: 189 }, + { #f9c96be9: { #c1127ea9: 187 } }, + { #08ec7593: [ { #c1127ea9: 188 } ] })>, <#26796f6a: ({ #d121c0bd: 14 }, { #f9c96be9: { #c1127ea9: 95 } }, { #08ec7593: [ { #c1127ea9: 16 } ] })>, - <#295746e6: ({ #d121c0bd: 189 }, { #c1127ea9: 8 })>, + <#295746e6: ({ #d121c0bd: 190 }, { #c1127ea9: 8 })>, <#295746e6: ({ #d121c0bd: 20 }, { #c1127ea9: 47 })>, <#26796f6a: - ({ #d121c0bd: 190 }, - { #f9c96be9: { #c1127ea9: 186 } }, - { #08ec7593: [ { #c1127ea9: 189 } ] })>, + ({ #d121c0bd: 191 }, + { #f9c96be9: { #c1127ea9: 187 } }, + { #08ec7593: [ { #c1127ea9: 190 } ] })>, <#26796f6a: ({ #d121c0bd: 18 }, { #f9c96be9: { #c1127ea9: 95 } }, @@ -1743,24 +1744,24 @@ ({ #d121c0bd: 22 }, { #f9c96be9: { #c1127ea9: 114 } }, { })>, <#d80cb60b: ({ #d121c0bd: 33 }, 32)>, <#263b5f37: ({ #d121c0bd: 65, #26f32be5: 33 })>, - <#0b08cd60: ({ #d121c0bd: 191 }, { #c1127ea9: 33 })>, + <#0b08cd60: ({ #d121c0bd: 192 }, { #c1127ea9: 33 })>, <#0b08cd60: ({ #d121c0bd: 102 }, { #c1127ea9: 65 })>, - <#0b08cd60: ({ #d121c0bd: 192 }, { #c1127ea9: 33, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 193 }, { #c1127ea9: 33, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 38 }, { #c1127ea9: 65, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 193 }, - { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 192 } ] })>, + ({ #d121c0bd: 194 }, + { #f9c96be9: { #c1127ea9: 192 } }, + { #08ec7593: [ { #c1127ea9: 193 } ] })>, <#26796f6a: ({ #d121c0bd: 36 }, { #f9c96be9: { #c1127ea9: 102 } }, { #08ec7593: [ { #c1127ea9: 38 } ] })>, - <#295746e6: ({ #d121c0bd: 194 }, { #c1127ea9: 33 })>, + <#295746e6: ({ #d121c0bd: 195 }, { #c1127ea9: 33 })>, <#295746e6: ({ #d121c0bd: 42 }, { #c1127ea9: 65 })>, <#26796f6a: - ({ #d121c0bd: 195 }, - { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 194 } ] })>, + ({ #d121c0bd: 196 }, + { #f9c96be9: { #c1127ea9: 192 } }, + { #08ec7593: [ { #c1127ea9: 195 } ] })>, <#26796f6a: ({ #d121c0bd: 40 }, { #f9c96be9: { #c1127ea9: 102 } }, @@ -1769,19 +1770,19 @@ ({ #d121c0bd: 44 }, { #f9c96be9: { #c1127ea9: 114 } }, { })>, <#d80cb60b: ({ #d121c0bd: 56 }, 55)>, <#26796f6a: - ({ #d121c0bd: 196 }, { #f9c96be9: { #c1127ea9: 114 } }, { })>, + ({ #d121c0bd: 197 }, { #f9c96be9: { #c1127ea9: 114 } }, { })>, <#26796f6a: - ({ #d121c0bd: 197 }, + ({ #d121c0bd: 198 }, { #f9c96be9: { #c1127ea9: 114 } }, - { #08ec7593: [ { #c1127ea9: 187 } ] })>, + { #08ec7593: [ { #c1127ea9: 188 } ] })>, <#26796f6a: ({ #d121c0bd: 27 }, { #f9c96be9: { #c1127ea9: 114 } }, { #08ec7593: [ { #c1127ea9: 16 } ] })>, <#26796f6a: - ({ #d121c0bd: 198 }, + ({ #d121c0bd: 199 }, { #f9c96be9: { #c1127ea9: 114 } }, - { #08ec7593: [ { #c1127ea9: 189 } ] })>, + { #08ec7593: [ { #c1127ea9: 190 } ] })>, <#26796f6a: ({ #d121c0bd: 30 }, { #f9c96be9: { #c1127ea9: 114 } }, @@ -1790,38 +1791,38 @@ <#26796f6a: ({ #d121c0bd: 24 }, { #f9c96be9: { #c1127ea9: 114 } }, { })>, <#26796f6a: - ({ #d121c0bd: 199 }, { #f9c96be9: { #c1127ea9: 114 } }, { })>, + ({ #d121c0bd: 200 }, { #f9c96be9: { #c1127ea9: 114 } }, { })>, <#26796f6a: - ({ #d121c0bd: 200 }, + ({ #d121c0bd: 201 }, { #f9c96be9: { #c1127ea9: 114 } }, - { #08ec7593: [ { #c1127ea9: 192 } ] })>, + { #08ec7593: [ { #c1127ea9: 193 } ] })>, <#26796f6a: ({ #d121c0bd: 50 }, { #f9c96be9: { #c1127ea9: 114 } }, { #08ec7593: [ { #c1127ea9: 38 } ] })>, <#26796f6a: - ({ #d121c0bd: 201 }, + ({ #d121c0bd: 202 }, { #f9c96be9: { #c1127ea9: 114 } }, - { #08ec7593: [ { #c1127ea9: 194 } ] })>, + { #08ec7593: [ { #c1127ea9: 195 } ] })>, <#26796f6a: ({ #d121c0bd: 53 }, { #f9c96be9: { #c1127ea9: 114 } }, { #08ec7593: [ { #c1127ea9: 42 } ] })>, - <#d3d219f7: ({ #d121c0bd: 202 }, { #c1127ea9: 33 })>, + <#d3d219f7: ({ #d121c0bd: 203 }, { #c1127ea9: 33 })>, <#d3d219f7: ({ #d121c0bd: 71 }, { #c1127ea9: 65 })>, <#263b5f37: ({ #d121c0bd: 109, #26f32be5: 56 })>, - <#d3d219f7: ({ #d121c0bd: 203 }, { #c1127ea9: 56 })>, + <#d3d219f7: ({ #d121c0bd: 204 }, { #c1127ea9: 56 })>, <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 109 })>, - <#0b08cd60: ({ #d121c0bd: 204 }, { #c1127ea9: 56 })>, + <#0b08cd60: ({ #d121c0bd: 205 }, { #c1127ea9: 56 })>, <#0b08cd60: ({ #d121c0bd: 110 }, { #c1127ea9: 109 })>, - <#0098a8c5: ({ #d121c0bd: 205 }, { #fcd148e8: 170 })>, - <#2e3d736c: ({ #d121c0bd: 206 }, { #c1127ea9: 205 })>, + <#0098a8c5: ({ #d121c0bd: 206 }, { #fcd148e8: 171 })>, + <#2e3d736c: ({ #d121c0bd: 207 }, { #c1127ea9: 206 })>, <#19e1ef85: - ({ #d121c0bd: 207, #26f32be5: 206 }, - { #0b680f7d: { #c1127ea9: 206 }, #c3687459: 208 })>, + ({ #d121c0bd: 208, #26f32be5: 207 }, + { #0b680f7d: { #c1127ea9: 207 }, #c3687459: 209 })>, <#19e1ef85: - ({ #d121c0bd: 113, #26f32be5: 206 }, - { #0b680f7d: { #c1127ea9: 207 }, #c3687459: 112 })>, + ({ #d121c0bd: 113, #26f32be5: 207 }, + { #0b680f7d: { #c1127ea9: 208 }, #c3687459: 112 })>, <#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 c0d339d5eb5..87f2a30e0ae 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 @@ -2668,64 +2668,65 @@ <#22d546dd: ({ #d121c0bd: 163 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 164 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 165 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 166 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 167 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 168 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 169 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 170 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 171 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 172 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 173 }, { #c1127ea9: 115 })>, - <#22d546dd: ({ #d121c0bd: 174 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 175 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 176 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 177 }, 178)>, - <#d3d219f7: ({ #d121c0bd: 179 }, { #c1127ea9: 14, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 180 }, { #c1127ea9: 117, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 181 }, { #c1127ea9: 117 })>, - <#d80cb60b: ({ #d121c0bd: 182 }, 183)>, + <#22d546dd: ({ #d121c0bd: 166 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 167 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 168 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 169 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 170 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 171 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 172 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 173 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 174 }, { #c1127ea9: 115 })>, + <#22d546dd: ({ #d121c0bd: 175 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 176 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 177 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 178 }, 179)>, + <#d3d219f7: ({ #d121c0bd: 180 }, { #c1127ea9: 14, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 181 }, { #c1127ea9: 117, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 182 }, { #c1127ea9: 117 })>, + <#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: 115 } }, { #08ec7593: [ { #c1127ea9: 14 } ] })>, <#263b5f37: ({ #d121c0bd: 39, #26f32be5: 8 })>, - <#0b08cd60: ({ #d121c0bd: 186 }, { #c1127ea9: 8, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 187 }, { #c1127ea9: 8, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 18 }, { #c1127ea9: 39, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 187 }, + ({ #d121c0bd: 188 }, { #f9c96be9: { #c1127ea9: 115 } }, - { #08ec7593: [ { #c1127ea9: 186 } ] })>, + { #08ec7593: [ { #c1127ea9: 187 } ] })>, <#26796f6a: ({ #d121c0bd: 16 }, { #f9c96be9: { #c1127ea9: 115 } }, { #08ec7593: [ { #c1127ea9: 18 } ] })>, - <#0b08cd60: ({ #d121c0bd: 188 }, { #c1127ea9: 8 })>, - <#0b08cd60: ({ #d121c0bd: 189 }, { #c1127ea9: 39 })>, + <#0b08cd60: ({ #d121c0bd: 189 }, { #c1127ea9: 8 })>, + <#0b08cd60: ({ #d121c0bd: 190 }, { #c1127ea9: 39 })>, <#26796f6a: - ({ #d121c0bd: 190 }, - { #f9c96be9: { #c1127ea9: 188 } }, - { #08ec7593: [ { #c1127ea9: 186 } ] })>, + ({ #d121c0bd: 191 }, + { #f9c96be9: { #c1127ea9: 189 } }, + { #08ec7593: [ { #c1127ea9: 187 } ] })>, <#26796f6a: ({ #d121c0bd: 20 }, - { #f9c96be9: { #c1127ea9: 189 } }, + { #f9c96be9: { #c1127ea9: 190 } }, { #08ec7593: [ { #c1127ea9: 18 } ] })>, <#26796f6a: ({ #d121c0bd: 45 }, { #f9c96be9: { #c1127ea9: 115 } }, { })>, <#26796f6a: - ({ #d121c0bd: 191 }, { #f9c96be9: { #c1127ea9: 115 } }, { })>, + ({ #d121c0bd: 192 }, { #f9c96be9: { #c1127ea9: 115 } }, { })>, <#d80cb60b: ({ #d121c0bd: 25 }, 24)>, - <#d3d219f7: ({ #d121c0bd: 192 }, { #c1127ea9: 25 })>, + <#d3d219f7: ({ #d121c0bd: 193 }, { #c1127ea9: 25 })>, <#263b5f37: ({ #d121c0bd: 43, #26f32be5: 25 })>, <#26796f6a: - ({ #d121c0bd: 193 }, { #f9c96be9: { #c1127ea9: 115 } }, { })>, + ({ #d121c0bd: 194 }, { #f9c96be9: { #c1127ea9: 115 } }, { })>, <#26796f6a: - ({ #d121c0bd: 194 }, + ({ #d121c0bd: 195 }, { #f9c96be9: { #c1127ea9: 8 } }, { #08ec7593: [ { #c1127ea9: 8 } ] })>, <#26796f6a: @@ -2733,46 +2734,46 @@ { #f9c96be9: { #c1127ea9: 39 } }, { #08ec7593: [ { #c1127ea9: 39 } ] })>, <#26796f6a: - ({ #d121c0bd: 195 }, + ({ #d121c0bd: 196 }, { #f9c96be9: { #c1127ea9: 25 } }, { #08ec7593: [ { #c1127ea9: 25 } ] })>, <#26796f6a: ({ #d121c0bd: 41 }, { #f9c96be9: { #c1127ea9: 43 } }, { #08ec7593: [ { #c1127ea9: 43 } ] })>, - <#d3d219f7: ({ #d121c0bd: 196 }, { #c1127ea9: 39 })>, + <#d3d219f7: ({ #d121c0bd: 197 }, { #c1127ea9: 39 })>, <#26796f6a: ({ #d121c0bd: 23 }, { #f9c96be9: { #c1127ea9: 115 } }, { })>, - <#d3d219f7: ({ #d121c0bd: 197 }, { #c1127ea9: 194 })>, + <#d3d219f7: ({ #d121c0bd: 198 }, { #c1127ea9: 195 })>, <#d3d219f7: ({ #d121c0bd: 60 }, { #c1127ea9: 37 })>, - <#0b08cd60: ({ #d121c0bd: 198 }, { #c1127ea9: 25, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 199 }, { #c1127ea9: 25, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 34 }, { #c1127ea9: 43, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 199 }, + ({ #d121c0bd: 200 }, { #f9c96be9: { #c1127ea9: 115 } }, - { #08ec7593: [ { #c1127ea9: 198 } ] })>, + { #08ec7593: [ { #c1127ea9: 199 } ] })>, <#26796f6a: - ({ #d121c0bd: 200 }, + ({ #d121c0bd: 201 }, { #f9c96be9: { #c1127ea9: 115 } }, { #08ec7593: [ { #c1127ea9: 34 } ] })>, - <#0b08cd60: ({ #d121c0bd: 201 }, { #c1127ea9: 25 })>, - <#d3d219f7: ({ #d121c0bd: 202 }, { #c1127ea9: 43 })>, - <#d3d219f7: ({ #d121c0bd: 203 }, { #c1127ea9: 195 })>, + <#0b08cd60: ({ #d121c0bd: 202 }, { #c1127ea9: 25 })>, + <#d3d219f7: ({ #d121c0bd: 203 }, { #c1127ea9: 43 })>, + <#d3d219f7: ({ #d121c0bd: 204 }, { #c1127ea9: 196 })>, <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 41 })>, <#26796f6a: ({ #d121c0bd: 32 }, { #f9c96be9: { #c1127ea9: 115 } }, { #08ec7593: [ { #c1127ea9: 34 } ] })>, - <#d3d219f7: ({ #d121c0bd: 204 }, { #c1127ea9: 190 })>, + <#d3d219f7: ({ #d121c0bd: 205 }, { #c1127ea9: 191 })>, <#d3d219f7: ({ #d121c0bd: 99 }, { #c1127ea9: 20 })>, - <#0098a8c5: ({ #d121c0bd: 205 }, { #fcd148e8: 170 })>, - <#2e3d736c: ({ #d121c0bd: 206 }, { #c1127ea9: 205 })>, + <#0098a8c5: ({ #d121c0bd: 206 }, { #fcd148e8: 171 })>, + <#2e3d736c: ({ #d121c0bd: 207 }, { #c1127ea9: 206 })>, <#19e1ef85: - ({ #d121c0bd: 207, #26f32be5: 206 }, - { #0b680f7d: { #c1127ea9: 206 }, #c3687459: 208 })>, + ({ #d121c0bd: 208, #26f32be5: 207 }, + { #0b680f7d: { #c1127ea9: 207 }, #c3687459: 209 })>, <#19e1ef85: - ({ #d121c0bd: 114, #26f32be5: 206 }, - { #0b680f7d: { #c1127ea9: 207 }, #c3687459: 113 })>, + ({ #d121c0bd: 114, #26f32be5: 207 }, + { #0b680f7d: { #c1127ea9: 208 }, #c3687459: 113 })>, <#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 0f30bf3de03..548b9190637 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/friend.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/friend.cpp.exp @@ -325,93 +325,94 @@ <#22d546dd: ({ #d121c0bd: 84 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 85 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 86 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 87 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 88 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 89 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 90 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 91 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 92 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 93 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 94 }, { #c1127ea9: 36 })>, - <#22d546dd: ({ #d121c0bd: 95 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 96 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 97 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 98 }, 99)>, - <#d3d219f7: ({ #d121c0bd: 100 }, { #c1127ea9: 30, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 101 }, { #c1127ea9: 38, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 102 }, { #c1127ea9: 38 })>, - <#d80cb60b: ({ #d121c0bd: 103 }, 104)>, + <#22d546dd: ({ #d121c0bd: 87 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 88 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 89 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 90 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 91 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 92 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 93 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 94 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 95 }, { #c1127ea9: 36 })>, + <#22d546dd: ({ #d121c0bd: 96 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 97 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 98 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 99 }, 100)>, + <#d3d219f7: ({ #d121c0bd: 101 }, { #c1127ea9: 30, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 102 }, { #c1127ea9: 38, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 38 })>, + <#d80cb60b: ({ #d121c0bd: 104 }, 105)>, <#da0c5ecf: - ({ #d121c0bd: 105 }, - { #cd26765d: { #c1127ea9: 103 }, #11302019: 24 }, + ({ #d121c0bd: 106 }, + { #cd26765d: { #c1127ea9: 104 }, #11302019: 24 }, 1)>, - <#f3f3711a: ({ #d121c0bd: 106 })>, <#f3f3711a: ({ #d121c0bd: 107 })>, - <#ece2635f: ({ #d121c0bd: 108 })>, + <#f3f3711a: ({ #d121c0bd: 108 })>, <#ece2635f: ({ #d121c0bd: 109 })>, - <#d49f978d: ({ #d121c0bd: 110 })>, - <#f3f3711a: ({ #d121c0bd: 111 })>, - <#ece2635f: ({ #d121c0bd: 112 })>, + <#ece2635f: ({ #d121c0bd: 110 })>, + <#d49f978d: ({ #d121c0bd: 111 })>, + <#f3f3711a: ({ #d121c0bd: 112 })>, <#ece2635f: ({ #d121c0bd: 113 })>, - <#d49f978d: ({ #d121c0bd: 114 })>, - <#d3d219f7: ({ #d121c0bd: 115 }, { #c1127ea9: 106 })>, - <#d3d219f7: ({ #d121c0bd: 116 }, { #c1127ea9: 111 })>, - <#ece2635f: ({ #d121c0bd: 117 })>, + <#ece2635f: ({ #d121c0bd: 114 })>, + <#d49f978d: ({ #d121c0bd: 115 })>, + <#d3d219f7: ({ #d121c0bd: 116 }, { #c1127ea9: 107 })>, + <#d3d219f7: ({ #d121c0bd: 117 }, { #c1127ea9: 112 })>, <#ece2635f: ({ #d121c0bd: 118 })>, - <#263b5f37: ({ #d121c0bd: 119, #26f32be5: 118 })>, - <#f3f3711a: ({ #d121c0bd: 120 })>, + <#ece2635f: ({ #d121c0bd: 119 })>, + <#263b5f37: ({ #d121c0bd: 120, #26f32be5: 119 })>, <#f3f3711a: ({ #d121c0bd: 121 })>, - <#ece2635f: ({ #d121c0bd: 122 })>, + <#f3f3711a: ({ #d121c0bd: 122 })>, <#ece2635f: ({ #d121c0bd: 123 })>, - <#d49f978d: ({ #d121c0bd: 124 })>, + <#ece2635f: ({ #d121c0bd: 124 })>, + <#d49f978d: ({ #d121c0bd: 125 })>, <#d80cb60b: ({ #d121c0bd: 13 }, 12)>, - <#ece2635f: ({ #d121c0bd: 125, #26f32be5: 13 })>, + <#ece2635f: ({ #d121c0bd: 126, #26f32be5: 13 })>, <#263b5f37: ({ #d121c0bd: 32, #26f32be5: 13 })>, - <#dd64b59b: ({ #d121c0bd: 126, #26f32be5: 30 })>, + <#dd64b59b: ({ #d121c0bd: 127, #26f32be5: 30 })>, <#d3d219f7: ({ #d121c0bd: 10 }, { #c1127ea9: 30 })>, - <#d3d219f7: ({ #d121c0bd: 127 }, { #c1127ea9: 126 })>, + <#d3d219f7: ({ #d121c0bd: 128 }, { #c1127ea9: 127 })>, <#d80cb60b: ({ #d121c0bd: 9 }, 8)>, - <#ece2635f: ({ #d121c0bd: 128, #26f32be5: 9 })>, + <#ece2635f: ({ #d121c0bd: 129, #26f32be5: 9 })>, <#263b5f37: ({ #d121c0bd: 16, #26f32be5: 9 })>, - <#f3f3711a: ({ #d121c0bd: 129 })>, - <#26796f6a: - ({ #d121c0bd: 130 }, { #f9c96be9: { #c1127ea9: 36 } }, { })>, + <#f3f3711a: ({ #d121c0bd: 130 })>, <#26796f6a: ({ #d121c0bd: 131 }, { #f9c96be9: { #c1127ea9: 36 } }, { })>, - <#263b5f37: ({ #d121c0bd: 132, #26f32be5: 13 })>, - <#0b08cd60: ({ #d121c0bd: 133 }, { #c1127ea9: 13, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 25 }, { #c1127ea9: 132, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 134 }, + ({ #d121c0bd: 132 }, { #f9c96be9: { #c1127ea9: 36 } }, { })>, + <#263b5f37: ({ #d121c0bd: 133, #26f32be5: 13 })>, + <#0b08cd60: ({ #d121c0bd: 134 }, { #c1127ea9: 13, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 25 }, { #c1127ea9: 133, #ea1a680e: true })>, + <#26796f6a: + ({ #d121c0bd: 135 }, { #f9c96be9: { #c1127ea9: 36 } }, - { #08ec7593: [ { #c1127ea9: 133 } ] })>, + { #08ec7593: [ { #c1127ea9: 134 } ] })>, <#26796f6a: ({ #d121c0bd: 23 }, { #f9c96be9: { #c1127ea9: 36 } }, { #08ec7593: [ { #c1127ea9: 25 } ] })>, - <#295746e6: ({ #d121c0bd: 135 }, { #c1127ea9: 13 })>, - <#295746e6: ({ #d121c0bd: 29 }, { #c1127ea9: 132 })>, + <#295746e6: ({ #d121c0bd: 136 }, { #c1127ea9: 13 })>, + <#295746e6: ({ #d121c0bd: 29 }, { #c1127ea9: 133 })>, <#26796f6a: - ({ #d121c0bd: 136 }, + ({ #d121c0bd: 137 }, { #f9c96be9: { #c1127ea9: 36 } }, - { #08ec7593: [ { #c1127ea9: 135 } ] })>, + { #08ec7593: [ { #c1127ea9: 136 } ] })>, <#26796f6a: ({ #d121c0bd: 27 }, { #f9c96be9: { #c1127ea9: 36 } }, { #08ec7593: [ { #c1127ea9: 29 } ] })>, <#26796f6a: ({ #d121c0bd: 20 }, { #f9c96be9: { #c1127ea9: 36 } }, { })>, - <#d3d219f7: ({ #d121c0bd: 137 }, { #c1127ea9: 13 })>, - <#d3d219f7: ({ #d121c0bd: 138 }, { #c1127ea9: 32 })>, - <#0b08cd60: ({ #d121c0bd: 139 }, { #c1127ea9: 13 })>, - <#0098a8c5: ({ #d121c0bd: 140 }, { #fcd148e8: 91 })>, - <#2e3d736c: ({ #d121c0bd: 141 }, { #c1127ea9: 140 })>, + <#d3d219f7: ({ #d121c0bd: 138 }, { #c1127ea9: 13 })>, + <#d3d219f7: ({ #d121c0bd: 139 }, { #c1127ea9: 32 })>, + <#0b08cd60: ({ #d121c0bd: 140 }, { #c1127ea9: 13 })>, + <#0098a8c5: ({ #d121c0bd: 141 }, { #fcd148e8: 92 })>, + <#2e3d736c: ({ #d121c0bd: 142 }, { #c1127ea9: 141 })>, <#19e1ef85: - ({ #d121c0bd: 142, #26f32be5: 141 }, - { #0b680f7d: { #c1127ea9: 141 }, #c3687459: 143 })>, + ({ #d121c0bd: 143, #26f32be5: 142 }, + { #0b680f7d: { #c1127ea9: 142 }, #c3687459: 144 })>, <#19e1ef85: - ({ #d121c0bd: 35, #26f32be5: 141 }, - { #0b680f7d: { #c1127ea9: 142 }, #c3687459: 34 })>, + ({ #d121c0bd: 35, #26f32be5: 142 }, + { #0b680f7d: { #c1127ea9: 143 }, #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 e55a64da303..bd6330f794f 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/function_template.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/function_template.cpp.exp @@ -767,47 +767,48 @@ <#22d546dd: ({ #d121c0bd: 115 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 116 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 117 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 118 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 119 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 120 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 121 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 122 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 123 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 124 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 125 }, { #c1127ea9: 70 })>, - <#22d546dd: ({ #d121c0bd: 126 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 127 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 128 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 129 }, 130)>, - <#d3d219f7: ({ #d121c0bd: 131 }, { #c1127ea9: 38, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 132 }, { #c1127ea9: 25, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 133 }, { #c1127ea9: 25 })>, - <#d80cb60b: ({ #d121c0bd: 134 }, 135)>, + <#22d546dd: ({ #d121c0bd: 118 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 119 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 120 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 121 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 122 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 123 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 124 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 125 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 126 }, { #c1127ea9: 70 })>, + <#22d546dd: ({ #d121c0bd: 127 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 128 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 129 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 130 }, 131)>, + <#d3d219f7: ({ #d121c0bd: 132 }, { #c1127ea9: 38, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 133 }, { #c1127ea9: 25, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 134 }, { #c1127ea9: 25 })>, + <#d80cb60b: ({ #d121c0bd: 135 }, 136)>, <#da0c5ecf: - ({ #d121c0bd: 136 }, - { #cd26765d: { #c1127ea9: 134 }, #11302019: 24 }, + ({ #d121c0bd: 137 }, + { #cd26765d: { #c1127ea9: 135 }, #11302019: 24 }, 1)>, - <#f3f3711a: ({ #d121c0bd: 137 })>, <#f3f3711a: ({ #d121c0bd: 138 })>, - <#26796f6a: - ({ #d121c0bd: 139 }, - { #f9c96be9: { #c1127ea9: 137 } }, - { #08ec7593: [ { #c1127ea9: 137 } ] })>, + <#f3f3711a: ({ #d121c0bd: 139 })>, <#26796f6a: ({ #d121c0bd: 140 }, { #f9c96be9: { #c1127ea9: 138 } }, { #08ec7593: [ { #c1127ea9: 138 } ] })>, + <#26796f6a: + ({ #d121c0bd: 141 }, + { #f9c96be9: { #c1127ea9: 139 } }, + { #08ec7593: [ { #c1127ea9: 139 } ] })>, <#26796f6a: ({ #d121c0bd: 36 }, { #f9c96be9: { #c1127ea9: 38 } }, { #08ec7593: [ { #c1127ea9: 38 } ] })>, - <#dd64b59b: ({ #d121c0bd: 141, #26f32be5: 38 })>, - <#26796f6a: - ({ #d121c0bd: 142 }, - { #f9c96be9: { #c1127ea9: 141 } }, - { #08ec7593: [ { #c1127ea9: 141 } ] })>, + <#dd64b59b: ({ #d121c0bd: 142, #26f32be5: 38 })>, <#26796f6a: ({ #d121c0bd: 143 }, + { #f9c96be9: { #c1127ea9: 142 } }, + { #08ec7593: [ { #c1127ea9: 142 } ] })>, + <#26796f6a: + ({ #d121c0bd: 144 }, { #f9c96be9: { #c1127ea9: 16 } }, { #08ec7593: [ { #c1127ea9: 16 } ] })>, <#dd64b59b: ({ #d121c0bd: 11, #26f32be5: 16 })>, @@ -819,34 +820,34 @@ ({ #d121c0bd: 46 }, { #f9c96be9: { #c1127ea9: 70 } }, { })>, <#dd64b59b: ({ #d121c0bd: 20, #26f32be5: 25 })>, <#26796f6a: - ({ #d121c0bd: 144 }, + ({ #d121c0bd: 145 }, { #f9c96be9: { #c1127ea9: 25 } }, { #08ec7593: [ { #c1127ea9: 25 } ] })>, <#26796f6a: ({ #d121c0bd: 18 }, { #f9c96be9: { #c1127ea9: 20 } }, { #08ec7593: [ { #c1127ea9: 20 } ] })>, - <#d3d219f7: ({ #d121c0bd: 145 }, { #c1127ea9: 144 })>, + <#d3d219f7: ({ #d121c0bd: 146 }, { #c1127ea9: 145 })>, <#d3d219f7: ({ #d121c0bd: 57 }, { #c1127ea9: 18 })>, <#dd64b59b: ({ #d121c0bd: 29, #26f32be5: 34 })>, <#26796f6a: - ({ #d121c0bd: 146 }, + ({ #d121c0bd: 147 }, { #f9c96be9: { #c1127ea9: 34 } }, { #08ec7593: [ { #c1127ea9: 34 } ] })>, <#26796f6a: ({ #d121c0bd: 27 }, { #f9c96be9: { #c1127ea9: 29 } }, { #08ec7593: [ { #c1127ea9: 29 } ] })>, - <#d3d219f7: ({ #d121c0bd: 147 }, { #c1127ea9: 146 })>, + <#d3d219f7: ({ #d121c0bd: 148 }, { #c1127ea9: 147 })>, <#d3d219f7: ({ #d121c0bd: 65 }, { #c1127ea9: 27 })>, - <#0098a8c5: ({ #d121c0bd: 148 }, { #fcd148e8: 122 })>, - <#2e3d736c: ({ #d121c0bd: 149 }, { #c1127ea9: 148 })>, + <#0098a8c5: ({ #d121c0bd: 149 }, { #fcd148e8: 123 })>, + <#2e3d736c: ({ #d121c0bd: 150 }, { #c1127ea9: 149 })>, <#19e1ef85: - ({ #d121c0bd: 150, #26f32be5: 149 }, - { #0b680f7d: { #c1127ea9: 149 }, #c3687459: 151 })>, + ({ #d121c0bd: 151, #26f32be5: 150 }, + { #0b680f7d: { #c1127ea9: 150 }, #c3687459: 152 })>, <#19e1ef85: - ({ #d121c0bd: 69, #26f32be5: 149 }, - { #0b680f7d: { #c1127ea9: 150 }, #c3687459: 68 })>, + ({ #d121c0bd: 69, #26f32be5: 150 }, + { #0b680f7d: { #c1127ea9: 151 }, #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 90a6fc0fcbd..10da8db0a22 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 @@ -901,35 +901,36 @@ <#22d546dd: ({ #d121c0bd: 90 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 91 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 92 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 93 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 94 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 95 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 96 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 97 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 98 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 99 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 100 }, { #c1127ea9: 45 })>, - <#22d546dd: ({ #d121c0bd: 101 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 102 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 103 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 104 }, 105)>, - <#d3d219f7: ({ #d121c0bd: 106 }, { #c1127ea9: 15, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 107 }, { #c1127ea9: 12, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 108 }, { #c1127ea9: 12 })>, - <#d80cb60b: ({ #d121c0bd: 109 }, 110)>, + <#22d546dd: ({ #d121c0bd: 93 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 94 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 95 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 96 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 97 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 98 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 99 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 100 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 101 }, { #c1127ea9: 45 })>, + <#22d546dd: ({ #d121c0bd: 102 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 103 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 104 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 105 }, 106)>, + <#d3d219f7: ({ #d121c0bd: 107 }, { #c1127ea9: 15, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 108 }, { #c1127ea9: 12, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 109 }, { #c1127ea9: 12 })>, + <#d80cb60b: ({ #d121c0bd: 110 }, 111)>, <#da0c5ecf: - ({ #d121c0bd: 111 }, - { #cd26765d: { #c1127ea9: 109 }, #11302019: 24 }, + ({ #d121c0bd: 112 }, + { #cd26765d: { #c1127ea9: 110 }, #11302019: 24 }, 1)>, <#26796f6a: ({ #d121c0bd: 8 }, { #f9c96be9: { #c1127ea9: 15 } }, { })>, - <#0098a8c5: ({ #d121c0bd: 112 }, { #fcd148e8: 97 })>, - <#2e3d736c: ({ #d121c0bd: 113 }, { #c1127ea9: 112 })>, + <#0098a8c5: ({ #d121c0bd: 113 }, { #fcd148e8: 98 })>, + <#2e3d736c: ({ #d121c0bd: 114 }, { #c1127ea9: 113 })>, <#19e1ef85: - ({ #d121c0bd: 114, #26f32be5: 113 }, - { #0b680f7d: { #c1127ea9: 113 }, #c3687459: 115 })>, + ({ #d121c0bd: 115, #26f32be5: 114 }, + { #0b680f7d: { #c1127ea9: 114 }, #c3687459: 116 })>, <#19e1ef85: - ({ #d121c0bd: 44, #26f32be5: 113 }, - { #0b680f7d: { #c1127ea9: 114 }, #c3687459: 43 })>, + ({ #d121c0bd: 44, #26f32be5: 114 }, + { #0b680f7d: { #c1127ea9: 115 }, #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 a7f9f7391a8..58c3cd3849f 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheritance.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheritance.cpp.exp @@ -1518,25 +1518,26 @@ <#22d546dd: ({ #d121c0bd: 174 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 175 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 71 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 176 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 177 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 178 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 179 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 180 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 181 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 182 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 183 }, { #c1127ea9: 103 })>, - <#22d546dd: ({ #d121c0bd: 184 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 185 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 186 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 187 }, 188)>, - <#d3d219f7: ({ #d121c0bd: 189 }, { #c1127ea9: 22, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 190 }, { #c1127ea9: 129, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 191 }, { #c1127ea9: 129 })>, - <#d80cb60b: ({ #d121c0bd: 192 }, 193)>, + <#22d546dd: ({ #d121c0bd: 176 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 177 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 178 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 179 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 180 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 181 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 182 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 183 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 184 }, { #c1127ea9: 103 })>, + <#22d546dd: ({ #d121c0bd: 185 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 186 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 187 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 188 }, 189)>, + <#d3d219f7: ({ #d121c0bd: 190 }, { #c1127ea9: 22, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 191 }, { #c1127ea9: 129, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 192 }, { #c1127ea9: 129 })>, + <#d80cb60b: ({ #d121c0bd: 193 }, 194)>, <#da0c5ecf: - ({ #d121c0bd: 194 }, - { #cd26765d: { #c1127ea9: 192 }, #11302019: 24 }, + ({ #d121c0bd: 195 }, + { #cd26765d: { #c1127ea9: 193 }, #11302019: 24 }, 1)>, <#26796f6a: ({ #d121c0bd: 8 }, @@ -1557,69 +1558,69 @@ { #f9c96be9: { #c1127ea9: 103 } }, { #08ec7593: [ { #c1127ea9: 10 } ] })>, <#263b5f37: ({ #d121c0bd: 126, #26f32be5: 16 })>, - <#0b08cd60: ({ #d121c0bd: 195 }, { #c1127ea9: 16 })>, - <#0b08cd60: ({ #d121c0bd: 196 }, { #c1127ea9: 126 })>, - <#0b08cd60: ({ #d121c0bd: 197 }, { #c1127ea9: 16, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 196 }, { #c1127ea9: 16 })>, + <#0b08cd60: ({ #d121c0bd: 197 }, { #c1127ea9: 126 })>, + <#0b08cd60: ({ #d121c0bd: 198 }, { #c1127ea9: 16, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 46 }, { #c1127ea9: 126, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 198 }, - { #f9c96be9: { #c1127ea9: 195 } }, - { #08ec7593: [ { #c1127ea9: 197 } ] })>, + ({ #d121c0bd: 199 }, + { #f9c96be9: { #c1127ea9: 196 } }, + { #08ec7593: [ { #c1127ea9: 198 } ] })>, <#26796f6a: ({ #d121c0bd: 44 }, - { #f9c96be9: { #c1127ea9: 196 } }, + { #f9c96be9: { #c1127ea9: 197 } }, { #08ec7593: [ { #c1127ea9: 46 } ] })>, - <#295746e6: ({ #d121c0bd: 199 }, { #c1127ea9: 16 })>, + <#295746e6: ({ #d121c0bd: 200 }, { #c1127ea9: 16 })>, <#295746e6: ({ #d121c0bd: 50 }, { #c1127ea9: 126 })>, <#26796f6a: - ({ #d121c0bd: 200 }, - { #f9c96be9: { #c1127ea9: 195 } }, - { #08ec7593: [ { #c1127ea9: 199 } ] })>, + ({ #d121c0bd: 201 }, + { #f9c96be9: { #c1127ea9: 196 } }, + { #08ec7593: [ { #c1127ea9: 200 } ] })>, <#26796f6a: ({ #d121c0bd: 48 }, - { #f9c96be9: { #c1127ea9: 196 } }, + { #f9c96be9: { #c1127ea9: 197 } }, { #08ec7593: [ { #c1127ea9: 50 } ] })>, <#26796f6a: ({ #d121c0bd: 52 }, { #f9c96be9: { #c1127ea9: 103 } }, { })>, <#d80cb60b: ({ #d121c0bd: 54 }, 53)>, <#d3d219f7: ({ #d121c0bd: 70 }, { #c1127ea9: 54 })>, - <#0b08cd60: ({ #d121c0bd: 201 }, { #c1127ea9: 54 })>, + <#0b08cd60: ({ #d121c0bd: 202 }, { #c1127ea9: 54 })>, <#26796f6a: ({ #d121c0bd: 105 }, { #f9c96be9: { #c1127ea9: 115 } }, { })>, - <#263b5f37: ({ #d121c0bd: 202, #26f32be5: 54 })>, - <#0b08cd60: ({ #d121c0bd: 203 }, { #c1127ea9: 202 })>, - <#0b08cd60: ({ #d121c0bd: 204 }, { #c1127ea9: 54, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 119 }, { #c1127ea9: 202, #ea1a680e: true })>, + <#263b5f37: ({ #d121c0bd: 203, #26f32be5: 54 })>, + <#0b08cd60: ({ #d121c0bd: 204 }, { #c1127ea9: 203 })>, + <#0b08cd60: ({ #d121c0bd: 205 }, { #c1127ea9: 54, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 119 }, { #c1127ea9: 203, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 205 }, - { #f9c96be9: { #c1127ea9: 201 } }, - { #08ec7593: [ { #c1127ea9: 204 } ] })>, + ({ #d121c0bd: 206 }, + { #f9c96be9: { #c1127ea9: 202 } }, + { #08ec7593: [ { #c1127ea9: 205 } ] })>, <#26796f6a: ({ #d121c0bd: 117 }, - { #f9c96be9: { #c1127ea9: 203 } }, + { #f9c96be9: { #c1127ea9: 204 } }, { #08ec7593: [ { #c1127ea9: 119 } ] })>, - <#295746e6: ({ #d121c0bd: 206 }, { #c1127ea9: 54 })>, - <#295746e6: ({ #d121c0bd: 123 }, { #c1127ea9: 202 })>, + <#295746e6: ({ #d121c0bd: 207 }, { #c1127ea9: 54 })>, + <#295746e6: ({ #d121c0bd: 123 }, { #c1127ea9: 203 })>, <#26796f6a: - ({ #d121c0bd: 207 }, - { #f9c96be9: { #c1127ea9: 201 } }, - { #08ec7593: [ { #c1127ea9: 206 } ] })>, + ({ #d121c0bd: 208 }, + { #f9c96be9: { #c1127ea9: 202 } }, + { #08ec7593: [ { #c1127ea9: 207 } ] })>, <#26796f6a: ({ #d121c0bd: 121 }, - { #f9c96be9: { #c1127ea9: 203 } }, + { #f9c96be9: { #c1127ea9: 204 } }, { #08ec7593: [ { #c1127ea9: 123 } ] })>, <#26796f6a: ({ #d121c0bd: 125 }, { #f9c96be9: { #c1127ea9: 103 } }, { })>, <#d3d219f7: ({ #d121c0bd: 76 }, { #c1127ea9: 8 })>, <#d3d219f7: ({ #d121c0bd: 95 }, { #c1127ea9: 12 })>, - <#0098a8c5: ({ #d121c0bd: 208 }, { #fcd148e8: 180 })>, - <#2e3d736c: ({ #d121c0bd: 209 }, { #c1127ea9: 208 })>, + <#0098a8c5: ({ #d121c0bd: 209 }, { #fcd148e8: 181 })>, + <#2e3d736c: ({ #d121c0bd: 210 }, { #c1127ea9: 209 })>, <#19e1ef85: - ({ #d121c0bd: 210, #26f32be5: 209 }, - { #0b680f7d: { #c1127ea9: 209 }, #c3687459: 211 })>, + ({ #d121c0bd: 211, #26f32be5: 210 }, + { #0b680f7d: { #c1127ea9: 210 }, #c3687459: 212 })>, <#19e1ef85: - ({ #d121c0bd: 128, #26f32be5: 209 }, - { #0b680f7d: { #c1127ea9: 210 }, #c3687459: 127 })>, + ({ #d121c0bd: 128, #26f32be5: 210 }, + { #0b680f7d: { #c1127ea9: 211 }, #c3687459: 127 })>, <#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 c5d5ae16357..3210623cbe5 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheriting_constructor.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/inheriting_constructor.cpp.exp @@ -582,28 +582,29 @@ <#22d546dd: ({ #d121c0bd: 109 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 110 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 111 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 112 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 113 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 114 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 115 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 116 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 117 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 118 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 119 }, { #c1127ea9: 61 })>, - <#22d546dd: ({ #d121c0bd: 120 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 121 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 122 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 123 }, 124)>, - <#d3d219f7: ({ #d121c0bd: 125 }, { #c1127ea9: 13, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 126 }, { #c1127ea9: 63, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 127 }, { #c1127ea9: 63 })>, - <#d80cb60b: ({ #d121c0bd: 128 }, 129)>, + <#22d546dd: ({ #d121c0bd: 112 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 113 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 114 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 115 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 116 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 117 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 118 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 119 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 120 }, { #c1127ea9: 61 })>, + <#22d546dd: ({ #d121c0bd: 121 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 122 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 123 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 124 }, 125)>, + <#d3d219f7: ({ #d121c0bd: 126 }, { #c1127ea9: 13, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 127 }, { #c1127ea9: 63, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 128 }, { #c1127ea9: 63 })>, + <#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: 61 } }, @@ -612,22 +613,22 @@ ({ #d121c0bd: 16 }, { #f9c96be9: { #c1127ea9: 61 } }, { })>, <#d80cb60b: ({ #d121c0bd: 29 }, 28)>, <#263b5f37: ({ #d121c0bd: 49, #26f32be5: 8 })>, - <#0b08cd60: ({ #d121c0bd: 132 }, { #c1127ea9: 8, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 133 }, { #c1127ea9: 8, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 21 }, { #c1127ea9: 49, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 133 }, + ({ #d121c0bd: 134 }, { #f9c96be9: { #c1127ea9: 61 } }, - { #08ec7593: [ { #c1127ea9: 132 } ] })>, + { #08ec7593: [ { #c1127ea9: 133 } ] })>, <#26796f6a: ({ #d121c0bd: 19 }, { #f9c96be9: { #c1127ea9: 61 } }, { #08ec7593: [ { #c1127ea9: 21 } ] })>, - <#295746e6: ({ #d121c0bd: 134 }, { #c1127ea9: 8 })>, + <#295746e6: ({ #d121c0bd: 135 }, { #c1127ea9: 8 })>, <#295746e6: ({ #d121c0bd: 25 }, { #c1127ea9: 49 })>, <#26796f6a: - ({ #d121c0bd: 135 }, + ({ #d121c0bd: 136 }, { #f9c96be9: { #c1127ea9: 61 } }, - { #08ec7593: [ { #c1127ea9: 134 } ] })>, + { #08ec7593: [ { #c1127ea9: 135 } ] })>, <#26796f6a: ({ #d121c0bd: 23 }, { #f9c96be9: { #c1127ea9: 61 } }, @@ -635,50 +636,50 @@ <#26796f6a: ({ #d121c0bd: 36 }, { #f9c96be9: { #c1127ea9: 61 } }, { })>, <#263b5f37: ({ #d121c0bd: 57, #26f32be5: 29 })>, - <#0b08cd60: ({ #d121c0bd: 136 }, { #c1127ea9: 29, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 137 }, { #c1127ea9: 29, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 40 }, { #c1127ea9: 57, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 137 }, + ({ #d121c0bd: 138 }, { #f9c96be9: { #c1127ea9: 61 } }, - { #08ec7593: [ { #c1127ea9: 136 } ] })>, + { #08ec7593: [ { #c1127ea9: 137 } ] })>, <#26796f6a: ({ #d121c0bd: 38 }, { #f9c96be9: { #c1127ea9: 61 } }, { #08ec7593: [ { #c1127ea9: 40 } ] })>, <#26796f6a: ({ #d121c0bd: 27 }, { #f9c96be9: { #c1127ea9: 61 } }, { })>, - <#295746e6: ({ #d121c0bd: 138 }, { #c1127ea9: 29 })>, + <#295746e6: ({ #d121c0bd: 139 }, { #c1127ea9: 29 })>, <#295746e6: ({ #d121c0bd: 44 }, { #c1127ea9: 57 })>, <#26796f6a: - ({ #d121c0bd: 139 }, + ({ #d121c0bd: 140 }, { #f9c96be9: { #c1127ea9: 61 } }, - { #08ec7593: [ { #c1127ea9: 138 } ] })>, + { #08ec7593: [ { #c1127ea9: 139 } ] })>, <#26796f6a: ({ #d121c0bd: 42 }, { #f9c96be9: { #c1127ea9: 61 } }, { #08ec7593: [ { #c1127ea9: 44 } ] })>, <#26796f6a: ({ #d121c0bd: 52 }, { #f9c96be9: { #c1127ea9: 13 } }, { })>, - <#d3d219f7: ({ #d121c0bd: 140 }, { #c1127ea9: 127 })>, - <#0b08cd60: ({ #d121c0bd: 141 }, { #c1127ea9: 8 })>, - <#d3d219f7: ({ #d121c0bd: 142 }, { #c1127ea9: 29 })>, - <#d3d219f7: ({ #d121c0bd: 143 }, { #c1127ea9: 57 })>, + <#d3d219f7: ({ #d121c0bd: 141 }, { #c1127ea9: 128 })>, + <#0b08cd60: ({ #d121c0bd: 142 }, { #c1127ea9: 8 })>, + <#d3d219f7: ({ #d121c0bd: 143 }, { #c1127ea9: 29 })>, + <#d3d219f7: ({ #d121c0bd: 144 }, { #c1127ea9: 57 })>, <#26796f6a: - ({ #d121c0bd: 144 }, + ({ #d121c0bd: 145 }, { #f9c96be9: { #c1127ea9: 61 } }, { #08ec7593: [ { #c1127ea9: 13 } ] })>, <#26796f6a: ({ #d121c0bd: 46 }, { #f9c96be9: { #c1127ea9: 61 } }, { #08ec7593: [ { #c1127ea9: 13 } ] })>, - <#0098a8c5: ({ #d121c0bd: 145 }, { #fcd148e8: 116 })>, - <#2e3d736c: ({ #d121c0bd: 146 }, { #c1127ea9: 145 })>, + <#0098a8c5: ({ #d121c0bd: 146 }, { #fcd148e8: 117 })>, + <#2e3d736c: ({ #d121c0bd: 147 }, { #c1127ea9: 146 })>, <#19e1ef85: - ({ #d121c0bd: 147, #26f32be5: 146 }, - { #0b680f7d: { #c1127ea9: 146 }, #c3687459: 148 })>, + ({ #d121c0bd: 148, #26f32be5: 147 }, + { #0b680f7d: { #c1127ea9: 147 }, #c3687459: 149 })>, <#19e1ef85: - ({ #d121c0bd: 60, #26f32be5: 146 }, - { #0b680f7d: { #c1127ea9: 147 }, #c3687459: 59 })>, + ({ #d121c0bd: 60, #26f32be5: 147 }, + { #0b680f7d: { #c1127ea9: 148 }, #c3687459: 59 })>, <#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 67448157c1f..099fe860740 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/lambda.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/lambda.cpp.exp @@ -5430,80 +5430,81 @@ <#22d546dd: ({ #d121c0bd: 169 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 170 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 171 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 172 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 173 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 174 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 175 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 176 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 177 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 178 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 179 }, { #c1127ea9: 121 })>, - <#22d546dd: ({ #d121c0bd: 180 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 181 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 182 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 183 }, 184)>, - <#d3d219f7: ({ #d121c0bd: 185 }, { #c1127ea9: 12, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 186 }, { #c1127ea9: 123, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 187 }, { #c1127ea9: 123 })>, - <#d80cb60b: ({ #d121c0bd: 188 }, 189)>, + <#22d546dd: ({ #d121c0bd: 172 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 173 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 174 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 175 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 176 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 177 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 178 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 179 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 180 }, { #c1127ea9: 121 })>, + <#22d546dd: ({ #d121c0bd: 181 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 182 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 183 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 184 }, 185)>, + <#d3d219f7: ({ #d121c0bd: 186 }, { #c1127ea9: 12, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 187 }, { #c1127ea9: 123, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 188 }, { #c1127ea9: 123 })>, + <#d80cb60b: ({ #d121c0bd: 189 }, 190)>, <#da0c5ecf: - ({ #d121c0bd: 190 }, - { #cd26765d: { #c1127ea9: 188 }, #11302019: 24 }, + ({ #d121c0bd: 191 }, + { #cd26765d: { #c1127ea9: 189 }, #11302019: 24 }, 1)>, <#26796f6a: ({ #d121c0bd: 8 }, { #f9c96be9: { #c1127ea9: 12 } }, { })>, - <#d3d219f7: ({ #d121c0bd: 191 }, { #c1127ea9: 187 })>, + <#d3d219f7: ({ #d121c0bd: 192 }, { #c1127ea9: 188 })>, <#d80cb60b: ({ #d121c0bd: 22 }, 23)>, <#26796f6a: - ({ #d121c0bd: 192 }, { #f9c96be9: { #c1127ea9: 193 } }, { })>, - <#f3f3711a: ({ #d121c0bd: 194 })>, + ({ #d121c0bd: 193 }, { #f9c96be9: { #c1127ea9: 194 } }, { })>, <#f3f3711a: ({ #d121c0bd: 195 })>, - <#09e09de9: ({ #d121c0bd: 196, #26f32be5: 195 })>, + <#f3f3711a: ({ #d121c0bd: 196 })>, + <#09e09de9: ({ #d121c0bd: 197, #26f32be5: 196 })>, <#09e09de9: ({ #d121c0bd: 93, #26f32be5: 12 })>, <#26796f6a: - ({ #d121c0bd: 197 }, { #f9c96be9: { #c1127ea9: 12 } }, { })>, + ({ #d121c0bd: 198 }, { #f9c96be9: { #c1127ea9: 12 } }, { })>, <#26796f6a: ({ #d121c0bd: 25 }, { #f9c96be9: { #c1127ea9: 93 } }, { })>, <#26796f6a: ({ #d121c0bd: 29 }, { #f9c96be9: { #c1127ea9: 93 } }, { })>, - <#d3d219f7: ({ #d121c0bd: 198 }, { #c1127ea9: 8 })>, - <#d3d219f7: ({ #d121c0bd: 199 }, { #c1127ea9: 29 })>, + <#d3d219f7: ({ #d121c0bd: 199 }, { #c1127ea9: 8 })>, + <#d3d219f7: ({ #d121c0bd: 200 }, { #c1127ea9: 29 })>, <#26796f6a: - ({ #d121c0bd: 200 }, { #f9c96be9: { #c1127ea9: 198 } }, { })>, + ({ #d121c0bd: 201 }, { #f9c96be9: { #c1127ea9: 199 } }, { })>, <#26796f6a: - ({ #d121c0bd: 27 }, { #f9c96be9: { #c1127ea9: 199 } }, { })>, - <#26796f6a: - ({ #d121c0bd: 201 }, { #f9c96be9: { #c1127ea9: 121 } }, { })>, + ({ #d121c0bd: 27 }, { #f9c96be9: { #c1127ea9: 200 } }, { })>, <#26796f6a: ({ #d121c0bd: 202 }, { #f9c96be9: { #c1127ea9: 121 } }, { })>, + <#26796f6a: + ({ #d121c0bd: 203 }, { #f9c96be9: { #c1127ea9: 121 } }, { })>, <#26796f6a: ({ #d121c0bd: 31 }, { #f9c96be9: { #c1127ea9: 121 } }, { })>, - <#f3f3711a: ({ #d121c0bd: 203 })>, - <#09e09de9: ({ #d121c0bd: 204, #26f32be5: 203 })>, + <#f3f3711a: ({ #d121c0bd: 204 })>, + <#09e09de9: ({ #d121c0bd: 205, #26f32be5: 204 })>, <#09e09de9: ({ #d121c0bd: 41, #26f32be5: 22 })>, - <#263b5f37: ({ #d121c0bd: 205, #26f32be5: 22 })>, - <#0b08cd60: ({ #d121c0bd: 206 }, { #c1127ea9: 22, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 35 }, { #c1127ea9: 205, #ea1a680e: true })>, + <#263b5f37: ({ #d121c0bd: 206, #26f32be5: 22 })>, + <#0b08cd60: ({ #d121c0bd: 207 }, { #c1127ea9: 22, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 35 }, { #c1127ea9: 206, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 207 }, + ({ #d121c0bd: 208 }, { #f9c96be9: { #c1127ea9: 121 } }, - { #08ec7593: [ { #c1127ea9: 206 } ] })>, + { #08ec7593: [ { #c1127ea9: 207 } ] })>, <#26796f6a: ({ #d121c0bd: 33 }, { #f9c96be9: { #c1127ea9: 121 } }, { #08ec7593: [ { #c1127ea9: 35 } ] })>, - <#295746e6: ({ #d121c0bd: 208 }, { #c1127ea9: 22 })>, - <#295746e6: ({ #d121c0bd: 39 }, { #c1127ea9: 205 })>, + <#295746e6: ({ #d121c0bd: 209 }, { #c1127ea9: 22 })>, + <#295746e6: ({ #d121c0bd: 39 }, { #c1127ea9: 206 })>, <#26796f6a: - ({ #d121c0bd: 209 }, + ({ #d121c0bd: 210 }, { #f9c96be9: { #c1127ea9: 121 } }, - { #08ec7593: [ { #c1127ea9: 208 } ] })>, + { #08ec7593: [ { #c1127ea9: 209 } ] })>, <#26796f6a: - ({ #d121c0bd: 210 }, + ({ #d121c0bd: 211 }, { #f9c96be9: { #c1127ea9: 121 } }, { #08ec7593: [ { #c1127ea9: 39 } ] })>, - <#d3d219f7: ({ #d121c0bd: 211 }, { #c1127ea9: 22 })>, - <#d3d219f7: ({ #d121c0bd: 212 }, { #c1127ea9: 41 })>, - <#0b08cd60: ({ #d121c0bd: 213 }, { #c1127ea9: 22 })>, + <#d3d219f7: ({ #d121c0bd: 212 }, { #c1127ea9: 22 })>, + <#d3d219f7: ({ #d121c0bd: 213 }, { #c1127ea9: 41 })>, + <#0b08cd60: ({ #d121c0bd: 214 }, { #c1127ea9: 22 })>, <#26796f6a: ({ #d121c0bd: 37 }, { #f9c96be9: { #c1127ea9: 121 } }, @@ -5511,13 +5512,13 @@ <#d80cb60b: ({ #d121c0bd: 55 }, 56)>, <#0b08cd60: ({ #d121c0bd: 61 }, { #c1127ea9: 12 })>, <#26796f6a: - ({ #d121c0bd: 214 }, - { #f9c96be9: { #c1127ea9: 193 } }, + ({ #d121c0bd: 215 }, + { #f9c96be9: { #c1127ea9: 194 } }, { #08ec7593: [ { #c1127ea9: 12 } ] })>, - <#f3f3711a: ({ #d121c0bd: 215 })>, - <#09e09de9: ({ #d121c0bd: 216, #26f32be5: 215 })>, + <#f3f3711a: ({ #d121c0bd: 216 })>, + <#09e09de9: ({ #d121c0bd: 217, #26f32be5: 216 })>, <#26796f6a: - ({ #d121c0bd: 217 }, + ({ #d121c0bd: 218 }, { #f9c96be9: { #c1127ea9: 12 } }, { #08ec7593: [ { #c1127ea9: 12 } ] })>, <#26796f6a: @@ -5525,87 +5526,87 @@ { #f9c96be9: { #c1127ea9: 93 } }, { #08ec7593: [ { #c1127ea9: 12 } ] })>, <#26796f6a: - ({ #d121c0bd: 218 }, { #f9c96be9: { #c1127ea9: 121 } }, { })>, - <#f3f3711a: ({ #d121c0bd: 219 })>, - <#09e09de9: ({ #d121c0bd: 220, #26f32be5: 219 })>, + ({ #d121c0bd: 219 }, { #f9c96be9: { #c1127ea9: 121 } }, { })>, + <#f3f3711a: ({ #d121c0bd: 220 })>, + <#09e09de9: ({ #d121c0bd: 221, #26f32be5: 220 })>, <#09e09de9: ({ #d121c0bd: 81, #26f32be5: 55 })>, <#263b5f37: ({ #d121c0bd: 76, #26f32be5: 55 })>, - <#0b08cd60: ({ #d121c0bd: 221 }, { #c1127ea9: 55, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 222 }, { #c1127ea9: 55, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 67 }, { #c1127ea9: 76, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 222 }, + ({ #d121c0bd: 223 }, { #f9c96be9: { #c1127ea9: 121 } }, - { #08ec7593: [ { #c1127ea9: 221 } ] })>, + { #08ec7593: [ { #c1127ea9: 222 } ] })>, <#26796f6a: ({ #d121c0bd: 65 }, { #f9c96be9: { #c1127ea9: 121 } }, { #08ec7593: [ { #c1127ea9: 67 } ] })>, - <#295746e6: ({ #d121c0bd: 223 }, { #c1127ea9: 55 })>, + <#295746e6: ({ #d121c0bd: 224 }, { #c1127ea9: 55 })>, <#295746e6: ({ #d121c0bd: 71 }, { #c1127ea9: 76 })>, <#26796f6a: - ({ #d121c0bd: 224 }, + ({ #d121c0bd: 225 }, { #f9c96be9: { #c1127ea9: 121 } }, - { #08ec7593: [ { #c1127ea9: 223 } ] })>, + { #08ec7593: [ { #c1127ea9: 224 } ] })>, <#26796f6a: - ({ #d121c0bd: 225 }, + ({ #d121c0bd: 226 }, { #f9c96be9: { #c1127ea9: 121 } }, { #08ec7593: [ { #c1127ea9: 71 } ] })>, - <#d3d219f7: ({ #d121c0bd: 226 }, { #c1127ea9: 55 })>, - <#d3d219f7: ({ #d121c0bd: 227 }, { #c1127ea9: 81 })>, - <#0b08cd60: ({ #d121c0bd: 228 }, { #c1127ea9: 55 })>, + <#d3d219f7: ({ #d121c0bd: 227 }, { #c1127ea9: 55 })>, + <#d3d219f7: ({ #d121c0bd: 228 }, { #c1127ea9: 81 })>, + <#0b08cd60: ({ #d121c0bd: 229 }, { #c1127ea9: 55 })>, <#26796f6a: ({ #d121c0bd: 69 }, { #f9c96be9: { #c1127ea9: 121 } }, { #08ec7593: [ { #c1127ea9: 71 } ] })>, - <#f3f3711a: ({ #d121c0bd: 229 })>, - <#09e09de9: ({ #d121c0bd: 230, #26f32be5: 229 })>, + <#f3f3711a: ({ #d121c0bd: 230 })>, + <#09e09de9: ({ #d121c0bd: 231, #26f32be5: 230 })>, <#d80cb60b: ({ #d121c0bd: 95 }, 96)>, - <#f3f3711a: ({ #d121c0bd: 231 })>, - <#09e09de9: ({ #d121c0bd: 232, #26f32be5: 231 })>, - <#09e09de9: ({ #d121c0bd: 233, #26f32be5: 12 })>, + <#f3f3711a: ({ #d121c0bd: 232 })>, + <#09e09de9: ({ #d121c0bd: 233, #26f32be5: 232 })>, + <#09e09de9: ({ #d121c0bd: 234, #26f32be5: 12 })>, <#26796f6a: - ({ #d121c0bd: 98 }, { #f9c96be9: { #c1127ea9: 233 } }, { })>, + ({ #d121c0bd: 98 }, { #f9c96be9: { #c1127ea9: 234 } }, { })>, <#26796f6a: - ({ #d121c0bd: 234 }, { #f9c96be9: { #c1127ea9: 121 } }, { })>, - <#f3f3711a: ({ #d121c0bd: 235 })>, - <#09e09de9: ({ #d121c0bd: 236, #26f32be5: 235 })>, + ({ #d121c0bd: 235 }, { #f9c96be9: { #c1127ea9: 121 } }, { })>, + <#f3f3711a: ({ #d121c0bd: 236 })>, + <#09e09de9: ({ #d121c0bd: 237, #26f32be5: 236 })>, <#09e09de9: ({ #d121c0bd: 115, #26f32be5: 95 })>, <#263b5f37: ({ #d121c0bd: 114, #26f32be5: 95 })>, - <#0b08cd60: ({ #d121c0bd: 237 }, { #c1127ea9: 95, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 238 }, { #c1127ea9: 95, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 104 }, { #c1127ea9: 114, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 238 }, + ({ #d121c0bd: 239 }, { #f9c96be9: { #c1127ea9: 121 } }, - { #08ec7593: [ { #c1127ea9: 237 } ] })>, + { #08ec7593: [ { #c1127ea9: 238 } ] })>, <#26796f6a: ({ #d121c0bd: 102 }, { #f9c96be9: { #c1127ea9: 121 } }, { #08ec7593: [ { #c1127ea9: 104 } ] })>, - <#295746e6: ({ #d121c0bd: 239 }, { #c1127ea9: 95 })>, + <#295746e6: ({ #d121c0bd: 240 }, { #c1127ea9: 95 })>, <#295746e6: ({ #d121c0bd: 108 }, { #c1127ea9: 114 })>, <#26796f6a: - ({ #d121c0bd: 240 }, + ({ #d121c0bd: 241 }, { #f9c96be9: { #c1127ea9: 121 } }, - { #08ec7593: [ { #c1127ea9: 239 } ] })>, + { #08ec7593: [ { #c1127ea9: 240 } ] })>, <#26796f6a: - ({ #d121c0bd: 241 }, + ({ #d121c0bd: 242 }, { #f9c96be9: { #c1127ea9: 121 } }, { #08ec7593: [ { #c1127ea9: 108 } ] })>, - <#d3d219f7: ({ #d121c0bd: 242 }, { #c1127ea9: 95 })>, - <#d3d219f7: ({ #d121c0bd: 243 }, { #c1127ea9: 115 })>, - <#0b08cd60: ({ #d121c0bd: 244 }, { #c1127ea9: 95 })>, + <#d3d219f7: ({ #d121c0bd: 243 }, { #c1127ea9: 95 })>, + <#d3d219f7: ({ #d121c0bd: 244 }, { #c1127ea9: 115 })>, + <#0b08cd60: ({ #d121c0bd: 245 }, { #c1127ea9: 95 })>, <#26796f6a: ({ #d121c0bd: 106 }, { #f9c96be9: { #c1127ea9: 121 } }, { #08ec7593: [ { #c1127ea9: 108 } ] })>, - <#0098a8c5: ({ #d121c0bd: 245 }, { #fcd148e8: 176 })>, - <#2e3d736c: ({ #d121c0bd: 246 }, { #c1127ea9: 245 })>, + <#0098a8c5: ({ #d121c0bd: 246 }, { #fcd148e8: 177 })>, + <#2e3d736c: ({ #d121c0bd: 247 }, { #c1127ea9: 246 })>, <#19e1ef85: - ({ #d121c0bd: 247, #26f32be5: 246 }, - { #0b680f7d: { #c1127ea9: 246 }, #c3687459: 248 })>, + ({ #d121c0bd: 248, #26f32be5: 247 }, + { #0b680f7d: { #c1127ea9: 247 }, #c3687459: 249 })>, <#19e1ef85: - ({ #d121c0bd: 120, #26f32be5: 246 }, - { #0b680f7d: { #c1127ea9: 247 }, #c3687459: 119 })>, + ({ #d121c0bd: 120, #26f32be5: 247 }, + { #0b680f7d: { #c1127ea9: 248 }, #c3687459: 119 })>, <#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 455e6631c1c..5ad9388ffa7 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/materialize_temporary.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/materialize_temporary.cpp.exp @@ -162,35 +162,36 @@ <#22d546dd: ({ #d121c0bd: 64 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 65 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 66 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 67 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 68 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 69 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 70 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 71 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 72 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 73 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 74 }, { #c1127ea9: 17 })>, - <#22d546dd: ({ #d121c0bd: 75 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 76 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 77 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 78 }, 79)>, - <#d3d219f7: ({ #d121c0bd: 80 }, { #c1127ea9: 14, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 81 }, { #c1127ea9: 19, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 19 })>, - <#d80cb60b: ({ #d121c0bd: 83 }, 84)>, + <#22d546dd: ({ #d121c0bd: 67 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 68 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 69 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 70 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 71 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 72 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 73 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 74 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 75 }, { #c1127ea9: 17 })>, + <#22d546dd: ({ #d121c0bd: 76 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 77 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 78 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 79 }, 80)>, + <#d3d219f7: ({ #d121c0bd: 81 }, { #c1127ea9: 14, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 19, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 19 })>, + <#d80cb60b: ({ #d121c0bd: 84 }, 85)>, <#da0c5ecf: - ({ #d121c0bd: 85 }, - { #cd26765d: { #c1127ea9: 83 }, #11302019: 24 }, + ({ #d121c0bd: 86 }, + { #cd26765d: { #c1127ea9: 84 }, #11302019: 24 }, 1)>, <#0b08cd60: ({ #d121c0bd: 8 }, { #c1127ea9: 14, #ea1a680e: true })>, - <#0098a8c5: ({ #d121c0bd: 86 }, { #fcd148e8: 71 })>, - <#2e3d736c: ({ #d121c0bd: 87 }, { #c1127ea9: 86 })>, + <#0098a8c5: ({ #d121c0bd: 87 }, { #fcd148e8: 72 })>, + <#2e3d736c: ({ #d121c0bd: 88 }, { #c1127ea9: 87 })>, <#19e1ef85: - ({ #d121c0bd: 88, #26f32be5: 87 }, - { #0b680f7d: { #c1127ea9: 87 }, #c3687459: 89 })>, + ({ #d121c0bd: 89, #26f32be5: 88 }, + { #0b680f7d: { #c1127ea9: 88 }, #c3687459: 90 })>, <#19e1ef85: - ({ #d121c0bd: 16, #26f32be5: 87 }, - { #0b680f7d: { #c1127ea9: 88 }, #c3687459: 15 })>, + ({ #d121c0bd: 16, #26f32be5: 88 }, + { #0b680f7d: { #c1127ea9: 89 }, #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 705944cb8e1..e574d6028d5 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/namespace_decl.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/namespace_decl.cpp.exp @@ -69,13 +69,7 @@ { #c8ff724b: "V", #2cdb06fb: [ "V", "Q" ] }, [], { }, - { - #caa189ed: { - #c709e154: <#09c0ca7b>, - #ec05e4a8: 8, - #c8ff724b: { #c8ff724b: "V", #2cdb06fb: [ "V", "Q" ] } - } - })>, + { })>, <#da76a085: ({ #d121c0bd: 10, @@ -207,34 +201,35 @@ <#22d546dd: ({ #d121c0bd: 65 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 66 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 67 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 68 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 69 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 70 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 71 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 72 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 73 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 74 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 75 }, { #c1127ea9: 17 })>, - <#22d546dd: ({ #d121c0bd: 76 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 77 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 78 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 79 }, 80)>, - <#d3d219f7: ({ #d121c0bd: 81 }, { #c1127ea9: 12, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 19, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 19 })>, - <#d80cb60b: ({ #d121c0bd: 84 }, 85)>, + <#22d546dd: ({ #d121c0bd: 68 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 69 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 70 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 71 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 72 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 73 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 74 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 75 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 76 }, { #c1127ea9: 17 })>, + <#22d546dd: ({ #d121c0bd: 77 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 78 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 79 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 80 }, 81)>, + <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 12, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 19, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 84 }, { #c1127ea9: 19 })>, + <#d80cb60b: ({ #d121c0bd: 85 }, 86)>, <#da0c5ecf: - ({ #d121c0bd: 86 }, - { #cd26765d: { #c1127ea9: 84 }, #11302019: 24 }, + ({ #d121c0bd: 87 }, + { #cd26765d: { #c1127ea9: 85 }, #11302019: 24 }, 1)>, - <#0098a8c5: ({ #d121c0bd: 87 }, { #fcd148e8: 72 })>, - <#2e3d736c: ({ #d121c0bd: 88 }, { #c1127ea9: 87 })>, + <#0098a8c5: ({ #d121c0bd: 88 }, { #fcd148e8: 73 })>, + <#2e3d736c: ({ #d121c0bd: 89 }, { #c1127ea9: 88 })>, <#19e1ef85: - ({ #d121c0bd: 89, #26f32be5: 88 }, - { #0b680f7d: { #c1127ea9: 88 }, #c3687459: 90 })>, + ({ #d121c0bd: 90, #26f32be5: 89 }, + { #0b680f7d: { #c1127ea9: 89 }, #c3687459: 91 })>, <#19e1ef85: - ({ #d121c0bd: 16, #26f32be5: 88 }, - { #0b680f7d: { #c1127ea9: 89 }, #c3687459: 15 })>, + ({ #d121c0bd: 16, #26f32be5: 89 }, + { #0b680f7d: { #c1127ea9: 90 }, #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 ac505b02c9d..eaf3cc39d47 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/new.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/new.cpp.exp @@ -1599,8 +1599,6 @@ #d121c0bd: 132, #21793419: ({ }, { }), #eb8a1f5a: true, - #0a16e1f2: true, - #d3368c8a: true, #1771a8d7: [ <#efb2dc43: ({ #d121c0bd: 133, #21793419: ({ }, { }) }, <#caf525d3>)> @@ -1636,6 +1634,46 @@ ({ #d121c0bd: 138, #21793419: ({ }, { }) }, <#caf525d3>)> ] }, + { #c8ff724b: "operator delete", #2cdb06fb: [ "operator delete" ] }, + { #c1127ea9: 139 }, + { + #d2e9b40c: "4859567291822092785", + #f1a45f0e: true, + #d17ebeaa: [ + <#fd75cc45: + ({ + #d121c0bd: 140, + #f9005968: 137, + #21793419: ({ }, { }), + #eb8a1f5a: true + }, + { #c8ff724b: "", #2cdb06fb: [ "" ] }, + { #c1127ea9: 136 }, + { #0370b1b2: 0 })>, + <#fd75cc45: + ({ + #d121c0bd: 141, + #f9005968: 137, + #21793419: ({ }, { }), + #eb8a1f5a: true + }, + { #c8ff724b: "", #2cdb06fb: [ "" ] }, + { #c1127ea9: 68 }, + { #0370b1b2: 0 })> + ] + })>, + <#f173dfc2: + ({ + #d121c0bd: 142, + #21793419: ({ }, { }), + #eb8a1f5a: true, + #0a16e1f2: true, + #d3368c8a: true, + #1771a8d7: [ + <#efb2dc43: + ({ #d121c0bd: 143, #21793419: ({ }, { }) }, <#caf525d3>)> + ] + }, { #c8ff724b: "operator delete[]", #2cdb06fb: [ "operator delete[]" ] @@ -1647,19 +1685,62 @@ #d17ebeaa: [ <#fd75cc45: ({ - #d121c0bd: 139, - #f9005968: 137, + #d121c0bd: 144, + #f9005968: 142, + #21793419: ({ }, { }), + #eb8a1f5a: true + }, + { #c8ff724b: "", #2cdb06fb: [ "" ] }, + { #c1127ea9: 136 }, + { #0370b1b2: 0 })> + ] + })>, + <#f173dfc2: + ({ + #d121c0bd: 145, + #21793419: ({ }, { }), + #eb8a1f5a: true, + #0a16e1f2: true, + #d3368c8a: true, + #1771a8d7: [ + <#efb2dc43: + ({ #d121c0bd: 146, #21793419: ({ }, { }) }, <#caf525d3>)> + ] + }, + { + #c8ff724b: "operator delete[]", + #2cdb06fb: [ "operator delete[]" ] + }, + { #c1127ea9: 139 }, + { + #d2e9b40c: "7257393423842453000", + #f1a45f0e: true, + #d17ebeaa: [ + <#fd75cc45: + ({ + #d121c0bd: 147, + #f9005968: 145, #21793419: ({ }, { }), #eb8a1f5a: true }, { #c8ff724b: "", #2cdb06fb: [ "" ] }, { #c1127ea9: 136 }, + { #0370b1b2: 0 })>, + <#fd75cc45: + ({ + #d121c0bd: 148, + #f9005968: 145, + #21793419: ({ }, { }), + #eb8a1f5a: true + }, + { #c8ff724b: "", #2cdb06fb: [ "" ] }, + { #c1127ea9: 68 }, { #0370b1b2: 0 })> ] })>, <#f173dfc2: ({ - #d121c0bd: 140, + #d121c0bd: 149, #21793419: ({ #c7b317f4: 38, #c68b4ed6: 1 }, { #c7b317f4: 43, #c68b4ed6: 1 }) @@ -1669,11 +1750,11 @@ { #d2e9b40c: "6095890702841955930", #f1a45f0e: true, - #ebe3c415: 140, + #ebe3c415: 149, #c11b7aa2: <#d394bb73: ({ - #d121c0bd: 141, + #d121c0bd: 150, #21793419: ({ #c7b317f4: 38, #c68b4ed6: 17 }, { #c7b317f4: 43, #c68b4ed6: 1 }) @@ -1681,7 +1762,7 @@ [ <#152ea3f2: ({ - #d121c0bd: 142, + #d121c0bd: 151, #21793419: ({ #c7b317f4: 39, #c68b4ed6: 3 }, { #c68b4ed6: 32 }) @@ -1689,20 +1770,20 @@ [ <#c00c83f2: ({ - #d121c0bd: 143, + #d121c0bd: 152, #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 31 }) }, [ <#c3b129f9: ({ - #d121c0bd: 144, + #d121c0bd: 153, #21793419: ({ #c68b4ed6: 21 }, { }) }, [ <#0fb8fb71: ({ - #d121c0bd: 145, + #d121c0bd: 154, #21793419: ({ }, { }) }, [], @@ -1718,14 +1799,14 @@ false)>, <#0fdba003: ({ - #d121c0bd: 146, + #d121c0bd: 155, #21793419: ({ #c68b4ed6: 23 }, { #c68b4ed6: 31 }) }, [ <#0fb8fb71: ({ - #d121c0bd: 147, + #d121c0bd: 156, #21793419: ({ #c68b4ed6: 24 }, { }) }, @@ -1738,7 +1819,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 148, + #d121c0bd: 157, #21793419: ({ #c68b4ed6: 27 }, { }) }, @@ -1751,7 +1832,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 149, + #d121c0bd: 158, #21793419: ({ #c68b4ed6: 30 }, { }) }, @@ -1763,19 +1844,19 @@ #31b87f71: "3" })> ], - { #30e4876a: { #c1127ea9: 150 } })> + { #30e4876a: { #c1127ea9: 159 } })> ], { #30e4876a: { #c1127ea9: 61 } }, { #c54bdc44: true, - #c4225f4d: 144, - #d04948b2: 146 + #c4225f4d: 153, + #d04948b2: 155 })> ], [ <#11c182d1: ({ - #d121c0bd: 151, + #d121c0bd: 160, #21793419: ({ #c68b4ed6: 3 }, { #c68b4ed6: 31 }) }, @@ -1785,7 +1866,7 @@ #fe93c404: <#c00c83f2: ({ - #d121c0bd: 143, + #d121c0bd: 152, #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 31 }) @@ -1793,14 +1874,14 @@ [ <#c3b129f9: ({ - #d121c0bd: 144, + #d121c0bd: 153, #21793419: ({ #c68b4ed6: 21 }, { }) }, [ <#0fb8fb71: ({ - #d121c0bd: 145, + #d121c0bd: 154, #21793419: ({ }, { }) }, [], @@ -1823,7 +1904,7 @@ false)>, <#0fdba003: ({ - #d121c0bd: 146, + #d121c0bd: 155, #21793419: ({ #c68b4ed6: 23 }, { #c68b4ed6: 31 }) @@ -1831,7 +1912,7 @@ [ <#0fb8fb71: ({ - #d121c0bd: 147, + #d121c0bd: 156, #21793419: ({ #c68b4ed6: 24 }, { }) }, @@ -1848,7 +1929,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 148, + #d121c0bd: 157, #21793419: ({ #c68b4ed6: 27 }, { }) }, @@ -1865,7 +1946,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 149, + #d121c0bd: 158, #21793419: ({ #c68b4ed6: 30 }, { }) }, @@ -1881,19 +1962,19 @@ #31b87f71: "3" })> ], - { #30e4876a: { #c1127ea9: 150 } })> + { #30e4876a: { #c1127ea9: 159 } })> ], { #30e4876a: { #c1127ea9: 61 } }, { #c54bdc44: true, - #c4225f4d: 144, - #d04948b2: 146 + #c4225f4d: 153, + #d04948b2: 155 })> })> ])>, <#152ea3f2: ({ - #d121c0bd: 152, + #d121c0bd: 161, #21793419: ({ #c7b317f4: 40, #c68b4ed6: 3 }, { #c68b4ed6: 30 }) @@ -1901,21 +1982,21 @@ [ <#c00c83f2: ({ - #d121c0bd: 153, + #d121c0bd: 162, #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 29 }) }, [ <#e5067ee9: ({ - #d121c0bd: 154, + #d121c0bd: 163, #21793419: ({ #c68b4ed6: 17 }, { #c68b4ed6: 29 }) }, [ <#0fb8fb71: ({ - #d121c0bd: 155, + #d121c0bd: 164, #21793419: ({ #c68b4ed6: 25 }, { }) }, @@ -1928,7 +2009,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 156, + #d121c0bd: 165, #21793419: ({ #c68b4ed6: 28 }, { }) }, @@ -1954,12 +2035,12 @@ })> ], { #30e4876a: { #c1127ea9: 89 } }, - { #d04948b2: 154 })> + { #d04948b2: 163 })> ], [ <#11c182d1: ({ - #d121c0bd: 157, + #d121c0bd: 166, #21793419: ({ #c68b4ed6: 3 }, { #c68b4ed6: 29 }) }, @@ -1969,7 +2050,7 @@ #fe93c404: <#c00c83f2: ({ - #d121c0bd: 153, + #d121c0bd: 162, #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 29 }) @@ -1977,7 +2058,7 @@ [ <#e5067ee9: ({ - #d121c0bd: 154, + #d121c0bd: 163, #21793419: ({ #c68b4ed6: 17 }, { #c68b4ed6: 29 }) @@ -1985,7 +2066,7 @@ [ <#0fb8fb71: ({ - #d121c0bd: 155, + #d121c0bd: 164, #21793419: ({ #c68b4ed6: 25 }, { }) }, @@ -2002,7 +2083,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 156, + #d121c0bd: 165, #21793419: ({ #c68b4ed6: 28 }, { }) }, @@ -2034,12 +2115,12 @@ })> ], { #30e4876a: { #c1127ea9: 89 } }, - { #d04948b2: 154 })> + { #d04948b2: 163 })> })> ])>, <#152ea3f2: ({ - #d121c0bd: 158, + #d121c0bd: 167, #21793419: ({ #c7b317f4: 41, #c68b4ed6: 3 }, { #c68b4ed6: 53 }) @@ -2047,20 +2128,20 @@ [ <#c00c83f2: ({ - #d121c0bd: 159, + #d121c0bd: 168, #21793419: ({ #c68b4ed6: 15 }, { #c68b4ed6: 52 }) }, [ <#c3b129f9: ({ - #d121c0bd: 160, + #d121c0bd: 169, #21793419: ({ #c68b4ed6: 27 }, { }) }, [ <#0fb8fb71: ({ - #d121c0bd: 161, + #d121c0bd: 170, #21793419: ({ }, { }) }, [], @@ -2076,14 +2157,14 @@ false)>, <#0fdba003: ({ - #d121c0bd: 162, + #d121c0bd: 171, #21793419: ({ #c68b4ed6: 29 }, { #c68b4ed6: 52 }) }, [ <#e5067ee9: ({ - #d121c0bd: 163, + #d121c0bd: 172, #21793419: ({ #c68b4ed6: 30 }, { #c68b4ed6: 35 }) @@ -2091,7 +2172,7 @@ [ <#0fb8fb71: ({ - #d121c0bd: 164, + #d121c0bd: 173, #21793419: ({ #c68b4ed6: 31 }, { }) }, @@ -2108,7 +2189,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 165, + #d121c0bd: 174, #21793419: ({ #c68b4ed6: 34 }, { }) }, @@ -2140,7 +2221,7 @@ })>, <#e5067ee9: ({ - #d121c0bd: 166, + #d121c0bd: 175, #21793419: ({ #c68b4ed6: 38 }, { #c68b4ed6: 43 }) @@ -2148,7 +2229,7 @@ [ <#0fb8fb71: ({ - #d121c0bd: 167, + #d121c0bd: 176, #21793419: ({ #c68b4ed6: 39 }, { }) }, @@ -2165,7 +2246,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 168, + #d121c0bd: 177, #21793419: ({ #c68b4ed6: 42 }, { }) }, @@ -2197,7 +2278,7 @@ })>, <#e5067ee9: ({ - #d121c0bd: 169, + #d121c0bd: 178, #21793419: ({ #c68b4ed6: 46 }, { #c68b4ed6: 51 }) @@ -2205,7 +2286,7 @@ [ <#0fb8fb71: ({ - #d121c0bd: 170, + #d121c0bd: 179, #21793419: ({ #c68b4ed6: 47 }, { }) }, @@ -2222,7 +2303,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 171, + #d121c0bd: 180, #21793419: ({ #c68b4ed6: 50 }, { }) }, @@ -2253,19 +2334,19 @@ } })> ], - { #30e4876a: { #c1127ea9: 172 } })> + { #30e4876a: { #c1127ea9: 181 } })> ], { #30e4876a: { #c1127ea9: 89 } }, { #c54bdc44: true, - #c4225f4d: 160, - #d04948b2: 162 + #c4225f4d: 169, + #d04948b2: 171 })> ], [ <#11c182d1: ({ - #d121c0bd: 173, + #d121c0bd: 182, #21793419: ({ #c68b4ed6: 3 }, { #c68b4ed6: 52 }) }, @@ -2275,7 +2356,7 @@ #fe93c404: <#c00c83f2: ({ - #d121c0bd: 159, + #d121c0bd: 168, #21793419: ({ #c68b4ed6: 15 }, { #c68b4ed6: 52 }) @@ -2283,14 +2364,14 @@ [ <#c3b129f9: ({ - #d121c0bd: 160, + #d121c0bd: 169, #21793419: ({ #c68b4ed6: 27 }, { }) }, [ <#0fb8fb71: ({ - #d121c0bd: 161, + #d121c0bd: 170, #21793419: ({ }, { }) }, [], @@ -2313,7 +2394,7 @@ false)>, <#0fdba003: ({ - #d121c0bd: 162, + #d121c0bd: 171, #21793419: ({ #c68b4ed6: 29 }, { #c68b4ed6: 52 }) @@ -2321,7 +2402,7 @@ [ <#e5067ee9: ({ - #d121c0bd: 163, + #d121c0bd: 172, #21793419: ({ #c68b4ed6: 30 }, { #c68b4ed6: 35 }) @@ -2329,7 +2410,7 @@ [ <#0fb8fb71: ({ - #d121c0bd: 164, + #d121c0bd: 173, #21793419: ({ #c68b4ed6: 31 @@ -2349,7 +2430,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 165, + #d121c0bd: 174, #21793419: ({ #c68b4ed6: 34 @@ -2391,7 +2472,7 @@ })>, <#e5067ee9: ({ - #d121c0bd: 166, + #d121c0bd: 175, #21793419: ({ #c68b4ed6: 38 }, { #c68b4ed6: 43 }) @@ -2399,7 +2480,7 @@ [ <#0fb8fb71: ({ - #d121c0bd: 167, + #d121c0bd: 176, #21793419: ({ #c68b4ed6: 39 @@ -2419,7 +2500,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 168, + #d121c0bd: 177, #21793419: ({ #c68b4ed6: 42 @@ -2461,7 +2542,7 @@ })>, <#e5067ee9: ({ - #d121c0bd: 169, + #d121c0bd: 178, #21793419: ({ #c68b4ed6: 46 }, { #c68b4ed6: 51 }) @@ -2469,7 +2550,7 @@ [ <#0fb8fb71: ({ - #d121c0bd: 170, + #d121c0bd: 179, #21793419: ({ #c68b4ed6: 47 @@ -2489,7 +2570,7 @@ })>, <#0fb8fb71: ({ - #d121c0bd: 171, + #d121c0bd: 180, #21793419: ({ #c68b4ed6: 50 @@ -2530,13 +2611,13 @@ } })> ], - { #30e4876a: { #c1127ea9: 172 } })> + { #30e4876a: { #c1127ea9: 181 } })> ], { #30e4876a: { #c1127ea9: 89 } }, { #c54bdc44: true, - #c4225f4d: 160, - #d04948b2: 162 + #c4225f4d: 169, + #d04948b2: 171 })> })> ])> @@ -2544,7 +2625,7 @@ })>, <#f173dfc2: ({ - #d121c0bd: 174, + #d121c0bd: 183, #21793419: ({ #c7b317f4: 45, #c68b4ed6: 1 }, { #c7b317f4: 47, #c68b4ed6: 1 }), @@ -2552,15 +2633,15 @@ #d3368c8a: true }, { #c8ff724b: "operator new", #2cdb06fb: [ "operator new" ] }, - { #c1127ea9: 175 }, + { #c1127ea9: 184 }, { #d2e9b40c: "13351464032276683690", #f1a45f0e: true, #d17ebeaa: [ <#fd75cc45: ({ - #d121c0bd: 176, - #f9005968: 174, + #d121c0bd: 185, + #f9005968: 183, #21793419: ({ #c7b317f4: 45, #c68b4ed6: 20 }, { #c68b4ed6: 34 }) }, @@ -2569,8 +2650,8 @@ { #0370b1b2: 0 })>, <#fd75cc45: ({ - #d121c0bd: 177, - #f9005968: 174, + #d121c0bd: 186, + #f9005968: 183, #21793419: ({ #c68b4ed6: 40 }, { #c68b4ed6: 46 }) }, { #c8ff724b: "ptr", #2cdb06fb: [ "ptr" ] }, @@ -2578,8 +2659,8 @@ { #0370b1b2: 1 })>, <#fd75cc45: ({ - #d121c0bd: 178, - #f9005968: 174, + #d121c0bd: 187, + #f9005968: 183, #21793419: ({ #c68b4ed6: 51 }, { #c68b4ed6: 57 }), #0a16e1f2: true, #d3368c8a: true @@ -2588,28 +2669,28 @@ { #c1127ea9: 136 }, { #0370b1b2: 2 })> ], - #ebe3c415: 174, + #ebe3c415: 183, #c11b7aa2: <#d394bb73: ({ - #d121c0bd: 179, + #d121c0bd: 188, #21793419: ({ #c68b4ed6: 72 }, { #c7b317f4: 47, #c68b4ed6: 1 }) }, [ <#df3bdb38: ({ - #d121c0bd: 180, + #d121c0bd: 189, #21793419: ({ #c7b317f4: 46, #c68b4ed6: 3 }, { #c68b4ed6: 10 }) }, [ <#c3b129f9: - ({ #d121c0bd: 181, #21793419: ({ }, { }) }, + ({ #d121c0bd: 190, #21793419: ({ }, { }) }, [ <#e9db58be: - ({ #d121c0bd: 182, #21793419: ({ }, { }) }, + ({ #d121c0bd: 191, #21793419: ({ }, { }) }, [], { #30e4876a: { #c1127ea9: 136 }, @@ -2618,7 +2699,7 @@ { #c369ebbe: { #c709e154: <#334f163b>, - #ec05e4a8: 178, + #ec05e4a8: 187, #c8ff724b: { #c8ff724b: "ptr2", #2cdb06fb: [ "ptr2" ] @@ -2635,26 +2716,26 @@ })>, <#21116177: ({ - #d121c0bd: 183, + #d121c0bd: 192, #21793419: ({ #c7b317f4: 47, #c68b4ed6: 2 }, { }) })>, <#f173dfc2: ({ - #d121c0bd: 184, + #d121c0bd: 193, #21793419: ({ #c7b317f4: 49, #c68b4ed6: 1 }, { #c7b317f4: 52, #c68b4ed6: 1 }) }, { #c8ff724b: "test_placement", #2cdb06fb: [ "test_placement" ] }, - { #c1127ea9: 185 }, + { #c1127ea9: 194 }, { #d2e9b40c: "1553186570458038035", #f1a45f0e: true, #d17ebeaa: [ <#fd75cc45: ({ - #d121c0bd: 186, - #f9005968: 184, + #d121c0bd: 195, + #f9005968: 193, #21793419: ({ #c7b317f4: 49, #c68b4ed6: 21 }, { #c68b4ed6: 27 }), #0a16e1f2: true, @@ -2664,18 +2745,18 @@ { #c1127ea9: 136 }, { #0370b1b2: 0 })> ], - #ebe3c415: 184, + #ebe3c415: 193, #c11b7aa2: <#d394bb73: ({ - #d121c0bd: 187, + #d121c0bd: 196, #21793419: ({ #c68b4ed6: 32 }, { #c7b317f4: 52, #c68b4ed6: 1 }) }, [ <#152ea3f2: ({ - #d121c0bd: 188, + #d121c0bd: 197, #21793419: ({ #c7b317f4: 50, #c68b4ed6: 3 }, { #c68b4ed6: 12 }) @@ -2683,7 +2764,7 @@ [ <#0fb8fb71: ({ - #d121c0bd: 189, + #d121c0bd: 198, #21793419: ({ #c68b4ed6: 11 }, { }) }, [], @@ -2697,7 +2778,7 @@ [ <#11c182d1: ({ - #d121c0bd: 190, + #d121c0bd: 199, #21793419: ({ #c68b4ed6: 3 }, { #c68b4ed6: 11 }), #0a16e1f2: true, @@ -2710,7 +2791,7 @@ #fe93c404: <#0fb8fb71: ({ - #d121c0bd: 189, + #d121c0bd: 198, #21793419: ({ }, { }) }, [], @@ -2724,7 +2805,7 @@ ])>, <#152ea3f2: ({ - #d121c0bd: 191, + #d121c0bd: 200, #21793419: ({ #c7b317f4: 51, #c68b4ed6: 3 }, { #c68b4ed6: 30 }) @@ -2732,13 +2813,13 @@ [ <#c00c83f2: ({ - #d121c0bd: 192, + #d121c0bd: 201, #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 27 }) }, [ <#e5067ee9: - ({ #d121c0bd: 193, #21793419: ({ }, { }) }, + ({ #d121c0bd: 202, #21793419: ({ }, { }) }, [], { #30e4876a: { #c1127ea9: 30 } }, { @@ -2754,13 +2835,13 @@ })>, <#c3b129f9: ({ - #d121c0bd: 194, + #d121c0bd: 203, #21793419: ({ #c68b4ed6: 18 }, { }) }, [ <#e9db58be: ({ - #d121c0bd: 195, + #d121c0bd: 204, #21793419: ({ }, { }) }, [], @@ -2771,7 +2852,7 @@ { #c369ebbe: { #c709e154: <#334f163b>, - #ec05e4a8: 186, + #ec05e4a8: 195, #c8ff724b: { #c8ff724b: "ptr", #2cdb06fb: [ "ptr" ] @@ -2785,14 +2866,14 @@ false)>, <#c3b129f9: ({ - #d121c0bd: 196, + #d121c0bd: 205, #21793419: ({ #c68b4ed6: 23 }, { #c68b4ed6: 24 }) }, [ <#30da4453: ({ - #d121c0bd: 197, + #d121c0bd: 206, #21793419: ({ #c68b4ed6: 23 }, { #c68b4ed6: 24 }) @@ -2800,7 +2881,7 @@ [ <#e9db58be: ({ - #d121c0bd: 198, + #d121c0bd: 207, #21793419: ({ }, { }) }, [], @@ -2813,7 +2894,7 @@ { #c369ebbe: { #c709e154: <#004196c7>, - #ec05e4a8: 190, + #ec05e4a8: 199, #c8ff724b: { #c8ff724b: "i", #2cdb06fb: [ "i" ] @@ -2832,12 +2913,12 @@ false)> ], { #30e4876a: { #c1127ea9: 73 } }, - { #d04948b2: 193, #cacc0137: [ 194, 196 ] })> + { #d04948b2: 202, #cacc0137: [ 203, 205 ] })> ], [ <#11c182d1: ({ - #d121c0bd: 199, + #d121c0bd: 208, #21793419: ({ #c68b4ed6: 3 }, { #c68b4ed6: 27 }) }, @@ -2847,7 +2928,7 @@ #fe93c404: <#c00c83f2: ({ - #d121c0bd: 192, + #d121c0bd: 201, #21793419: ({ #c68b4ed6: 13 }, { #c68b4ed6: 27 }) @@ -2855,7 +2936,7 @@ [ <#e5067ee9: ({ - #d121c0bd: 193, + #d121c0bd: 202, #21793419: ({ }, { }) }, [], @@ -2873,14 +2954,14 @@ })>, <#c3b129f9: ({ - #d121c0bd: 194, + #d121c0bd: 203, #21793419: ({ #c68b4ed6: 18 }, { }) }, [ <#e9db58be: ({ - #d121c0bd: 195, + #d121c0bd: 204, #21793419: ({ }, { }) }, [], @@ -2893,7 +2974,7 @@ { #c369ebbe: { #c709e154: <#334f163b>, - #ec05e4a8: 186, + #ec05e4a8: 195, #c8ff724b: { #c8ff724b: "ptr", #2cdb06fb: [ "ptr" ] @@ -2912,7 +2993,7 @@ false)>, <#c3b129f9: ({ - #d121c0bd: 196, + #d121c0bd: 205, #21793419: ({ #c68b4ed6: 23 }, { #c68b4ed6: 24 }) @@ -2920,7 +3001,7 @@ [ <#30da4453: ({ - #d121c0bd: 197, + #d121c0bd: 206, #21793419: ({ #c68b4ed6: 23 }, { #c68b4ed6: 24 }) @@ -2928,7 +3009,7 @@ [ <#e9db58be: ({ - #d121c0bd: 198, + #d121c0bd: 207, #21793419: ({ }, { }) }, @@ -2944,7 +3025,7 @@ #c369ebbe: { #c709e154: <#004196c7>, - #ec05e4a8: 190, + #ec05e4a8: 199, #c8ff724b: { #c8ff724b: "i", #2cdb06fb: [ @@ -2973,17 +3054,17 @@ ], { #30e4876a: { #c1127ea9: 73 } }, { - #d04948b2: 193, - #cacc0137: [ 194, 196 ] + #d04948b2: 202, + #cacc0137: [ 203, 205 ] })> })> ])> ])> })>, <#0f3f4d35: - ({ #d121c0bd: 200, #21793419: ({ }, { }), #eb8a1f5a: true }, + ({ #d121c0bd: 209, #21793419: ({ }, { }), #eb8a1f5a: true }, { #c8ff724b: "instancetype", #2cdb06fb: [ "instancetype" ] }, - 201, + 210, { })> ], { }, @@ -2999,81 +3080,82 @@ }, #1acb7079: [ <#22d546dd: ({ #d121c0bd: 102 }, <#392cef74>)>, - <#22d546dd: ({ #d121c0bd: 202 }, <#2bf4b04a>)>, - <#22d546dd: ({ #d121c0bd: 203 }, <#ec0a078a>)>, - <#22d546dd: ({ #d121c0bd: 204 }, <#f6dab0c9>)>, - <#22d546dd: ({ #d121c0bd: 205 }, <#0f54f45c>)>, + <#22d546dd: ({ #d121c0bd: 211 }, <#2bf4b04a>)>, + <#22d546dd: ({ #d121c0bd: 212 }, <#ec0a078a>)>, + <#22d546dd: ({ #d121c0bd: 213 }, <#f6dab0c9>)>, + <#22d546dd: ({ #d121c0bd: 214 }, <#0f54f45c>)>, <#22d546dd: ({ #d121c0bd: 11 }, <#0037c4cf>)>, - <#22d546dd: ({ #d121c0bd: 206 }, <#3290d19c>)>, - <#22d546dd: ({ #d121c0bd: 207 }, <#fee0a138>)>, - <#22d546dd: ({ #d121c0bd: 208 }, <#1da7d9cb>)>, - <#22d546dd: ({ #d121c0bd: 209 }, <#0baa9fe7>)>, - <#22d546dd: ({ #d121c0bd: 210 }, <#3866e79a>)>, + <#22d546dd: ({ #d121c0bd: 215 }, <#3290d19c>)>, + <#22d546dd: ({ #d121c0bd: 216 }, <#fee0a138>)>, + <#22d546dd: ({ #d121c0bd: 217 }, <#1da7d9cb>)>, + <#22d546dd: ({ #d121c0bd: 218 }, <#0baa9fe7>)>, + <#22d546dd: ({ #d121c0bd: 219 }, <#3866e79a>)>, <#22d546dd: ({ #d121c0bd: 68 }, <#23a02071>)>, - <#22d546dd: ({ #d121c0bd: 211 }, <#09087e8d>)>, - <#22d546dd: ({ #d121c0bd: 212 }, <#15c4357c>)>, - <#22d546dd: ({ #d121c0bd: 213 }, <#e75f9f31>)>, - <#22d546dd: ({ #d121c0bd: 214 }, <#c2f78dcd>)>, - <#22d546dd: ({ #d121c0bd: 215 }, <#3726ba3b>)>, - <#22d546dd: ({ #d121c0bd: 216 }, <#e583cc63>)>, - <#22d546dd: ({ #d121c0bd: 217 }, <#3759b761>)>, - <#22d546dd: ({ #d121c0bd: 218 }, <#ebd317dd>)>, - <#22d546dd: ({ #d121c0bd: 219 }, <#2ec759b9>)>, - <#22d546dd: ({ #d121c0bd: 220 }, <#284d329d>)>, - <#22d546dd: ({ #d121c0bd: 221 }, <#35acb472>)>, - <#22d546dd: ({ #d121c0bd: 222 }, <#2b1d0544>)>, - <#22d546dd: ({ #d121c0bd: 223 }, <#0106ffa8>)>, - <#22d546dd: ({ #d121c0bd: 224 }, <#d6bc9d8a>)>, - <#22d546dd: ({ #d121c0bd: 225 }, <#19b0df66>)>, - <#22d546dd: ({ #d121c0bd: 226 }, <#1336b84a>)>, - <#22d546dd: ({ #d121c0bd: 227 }, <#20963a1f>)>, - <#22d546dd: ({ #d121c0bd: 228 }, <#16068af1>)>, - <#22d546dd: ({ #d121c0bd: 229 }, <#ebf08555>)>, - <#22d546dd: ({ #d121c0bd: 230 }, <#d78ceb63>)>, - <#22d546dd: ({ #d121c0bd: 231 }, <#dd2a33f3>)>, - <#22d546dd: ({ #d121c0bd: 232 }, <#ef62b1d7>)>, - <#22d546dd: ({ #d121c0bd: 233 }, <#0c8bf62c>)>, - <#22d546dd: ({ #d121c0bd: 234 }, <#13391dca>)>, - <#22d546dd: ({ #d121c0bd: 235 }, <#ecc0d32e>)>, - <#22d546dd: ({ #d121c0bd: 236 }, <#c2767110>)>, - <#22d546dd: ({ #d121c0bd: 237 }, <#c813b9a0>)>, - <#22d546dd: ({ #d121c0bd: 238 }, <#da4c3784>)>, - <#22d546dd: ({ #d121c0bd: 239 }, <#f7757bd9>)>, - <#22d546dd: ({ #d121c0bd: 240 }, <#fe22a377>)>, - <#22d546dd: ({ #d121c0bd: 241 }, <#d7aa58db>)>, - <#22d546dd: ({ #d121c0bd: 242 }, <#d2f340c8>)>, - <#22d546dd: ({ #d121c0bd: 243 }, <#2193aedd>)>, - <#22d546dd: ({ #d121c0bd: 244 }, <#0dd56321>)>, - <#22d546dd: ({ #d121c0bd: 245 }, <#d8e10c82>)>, - <#22d546dd: ({ #d121c0bd: 246 }, <#ec09df5b>)>, - <#22d546dd: ({ #d121c0bd: 247 }, <#ec09e115>)>, - <#22d546dd: ({ #d121c0bd: 248 }, <#c4f079df>)>, - <#22d546dd: ({ #d121c0bd: 249 }, <#1ee7219a>)>, - <#22d546dd: ({ #d121c0bd: 250 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 251 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 252 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 253 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 254 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 255 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 256 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 257 }, <#391b1e6e>)>, + <#22d546dd: ({ #d121c0bd: 220 }, <#09087e8d>)>, + <#22d546dd: ({ #d121c0bd: 221 }, <#15c4357c>)>, + <#22d546dd: ({ #d121c0bd: 222 }, <#e75f9f31>)>, + <#22d546dd: ({ #d121c0bd: 223 }, <#c2f78dcd>)>, + <#22d546dd: ({ #d121c0bd: 224 }, <#3726ba3b>)>, + <#22d546dd: ({ #d121c0bd: 225 }, <#e583cc63>)>, + <#22d546dd: ({ #d121c0bd: 226 }, <#3759b761>)>, + <#22d546dd: ({ #d121c0bd: 227 }, <#ebd317dd>)>, + <#22d546dd: ({ #d121c0bd: 228 }, <#2ec759b9>)>, + <#22d546dd: ({ #d121c0bd: 229 }, <#284d329d>)>, + <#22d546dd: ({ #d121c0bd: 230 }, <#35acb472>)>, + <#22d546dd: ({ #d121c0bd: 231 }, <#2b1d0544>)>, + <#22d546dd: ({ #d121c0bd: 232 }, <#0106ffa8>)>, + <#22d546dd: ({ #d121c0bd: 233 }, <#d6bc9d8a>)>, + <#22d546dd: ({ #d121c0bd: 234 }, <#19b0df66>)>, + <#22d546dd: ({ #d121c0bd: 235 }, <#1336b84a>)>, + <#22d546dd: ({ #d121c0bd: 236 }, <#20963a1f>)>, + <#22d546dd: ({ #d121c0bd: 237 }, <#16068af1>)>, + <#22d546dd: ({ #d121c0bd: 238 }, <#ebf08555>)>, + <#22d546dd: ({ #d121c0bd: 239 }, <#d78ceb63>)>, + <#22d546dd: ({ #d121c0bd: 240 }, <#dd2a33f3>)>, + <#22d546dd: ({ #d121c0bd: 241 }, <#ef62b1d7>)>, + <#22d546dd: ({ #d121c0bd: 242 }, <#0c8bf62c>)>, + <#22d546dd: ({ #d121c0bd: 243 }, <#13391dca>)>, + <#22d546dd: ({ #d121c0bd: 244 }, <#ecc0d32e>)>, + <#22d546dd: ({ #d121c0bd: 245 }, <#c2767110>)>, + <#22d546dd: ({ #d121c0bd: 246 }, <#c813b9a0>)>, + <#22d546dd: ({ #d121c0bd: 247 }, <#da4c3784>)>, + <#22d546dd: ({ #d121c0bd: 248 }, <#f7757bd9>)>, + <#22d546dd: ({ #d121c0bd: 249 }, <#fe22a377>)>, + <#22d546dd: ({ #d121c0bd: 250 }, <#d7aa58db>)>, + <#22d546dd: ({ #d121c0bd: 251 }, <#d2f340c8>)>, + <#22d546dd: ({ #d121c0bd: 252 }, <#2193aedd>)>, + <#22d546dd: ({ #d121c0bd: 253 }, <#0dd56321>)>, + <#22d546dd: ({ #d121c0bd: 254 }, <#d8e10c82>)>, + <#22d546dd: ({ #d121c0bd: 255 }, <#ec09df5b>)>, + <#22d546dd: ({ #d121c0bd: 256 }, <#ec09e115>)>, + <#22d546dd: ({ #d121c0bd: 257 }, <#c4f079df>)>, + <#22d546dd: ({ #d121c0bd: 258 }, <#1ee7219a>)>, + <#22d546dd: ({ #d121c0bd: 259 }, <#0d506118>)>, + <#22d546dd: ({ #d121c0bd: 260 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 261 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 262 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 263 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 264 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 265 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 266 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 267 }, <#391b1e6e>)>, <#d3d219f7: ({ #d121c0bd: 136 }, { #c1127ea9: 102 })>, - <#22d546dd: ({ #d121c0bd: 258 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 259 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 260 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 261 }, 262)>, - <#d3d219f7: ({ #d121c0bd: 263 }, { #c1127ea9: 11, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 264 }, { #c1127ea9: 203, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 265 }, { #c1127ea9: 203 })>, - <#d80cb60b: ({ #d121c0bd: 266 }, 267)>, + <#22d546dd: ({ #d121c0bd: 268 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 269 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 270 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 271 }, 272)>, + <#d3d219f7: ({ #d121c0bd: 273 }, { #c1127ea9: 11, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 274 }, { #c1127ea9: 212, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 275 }, { #c1127ea9: 212 })>, + <#d80cb60b: ({ #d121c0bd: 276 }, 277)>, <#da0c5ecf: - ({ #d121c0bd: 268 }, - { #cd26765d: { #c1127ea9: 266 }, #11302019: 24 }, + ({ #d121c0bd: 278 }, + { #cd26765d: { #c1127ea9: 276 }, #11302019: 24 }, 1)>, <#d80cb60b: ({ #d121c0bd: 8 }, 7)>, <#d80cb60b: ({ #d121c0bd: 25 }, 24)>, <#263b5f37: ({ #d121c0bd: 30, #26f32be5: 8 })>, - <#d3d219f7: ({ #d121c0bd: 269 }, { #c1127ea9: 25 })>, + <#d3d219f7: ({ #d121c0bd: 279 }, { #c1127ea9: 25 })>, <#26796f6a: ({ #d121c0bd: 32 }, { #f9c96be9: { #c1127ea9: 102 } }, { })>, <#26796f6a: @@ -3081,146 +3163,154 @@ { #f9c96be9: { #c1127ea9: 102 } }, { #08ec7593: [ { #c1127ea9: 11 }, { #c1127ea9: 11 } ] })>, <#26796f6a: - ({ #d121c0bd: 270 }, { #f9c96be9: { #c1127ea9: 102 } }, { })>, - <#0b08cd60: ({ #d121c0bd: 271 }, { #c1127ea9: 8, #ea1a680e: true })>, + ({ #d121c0bd: 280 }, { #f9c96be9: { #c1127ea9: 102 } }, { })>, + <#0b08cd60: ({ #d121c0bd: 281 }, { #c1127ea9: 8, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 18 }, { #c1127ea9: 30, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 272 }, + ({ #d121c0bd: 282 }, { #f9c96be9: { #c1127ea9: 102 } }, - { #08ec7593: [ { #c1127ea9: 271 } ] })>, + { #08ec7593: [ { #c1127ea9: 281 } ] })>, <#26796f6a: ({ #d121c0bd: 16 }, { #f9c96be9: { #c1127ea9: 102 } }, { #08ec7593: [ { #c1127ea9: 18 } ] })>, - <#295746e6: ({ #d121c0bd: 273 }, { #c1127ea9: 8 })>, + <#295746e6: ({ #d121c0bd: 283 }, { #c1127ea9: 8 })>, <#295746e6: ({ #d121c0bd: 22 }, { #c1127ea9: 30 })>, <#26796f6a: - ({ #d121c0bd: 274 }, + ({ #d121c0bd: 284 }, { #f9c96be9: { #c1127ea9: 102 } }, - { #08ec7593: [ { #c1127ea9: 273 } ] })>, + { #08ec7593: [ { #c1127ea9: 283 } ] })>, <#26796f6a: ({ #d121c0bd: 20 }, { #f9c96be9: { #c1127ea9: 102 } }, { #08ec7593: [ { #c1127ea9: 22 } ] })>, <#26796f6a: ({ #d121c0bd: 13 }, { #f9c96be9: { #c1127ea9: 102 } }, { })>, - <#d3d219f7: ({ #d121c0bd: 275 }, { #c1127ea9: 8 })>, + <#d3d219f7: ({ #d121c0bd: 285 }, { #c1127ea9: 8 })>, <#d3d219f7: ({ #d121c0bd: 73 }, { #c1127ea9: 30 })>, - <#0b08cd60: ({ #d121c0bd: 276 }, { #c1127ea9: 8 })>, - <#d3d219f7: ({ #d121c0bd: 277 }, { #c1127ea9: 278 })>, + <#0b08cd60: ({ #d121c0bd: 286 }, { #c1127ea9: 8 })>, + <#d3d219f7: ({ #d121c0bd: 287 }, { #c1127ea9: 288 })>, <#d3d219f7: ({ #d121c0bd: 61 }, { #c1127ea9: 11 })>, <#26796f6a: ({ #d121c0bd: 125 }, { #f9c96be9: { #c1127ea9: 136 } }, { #08ec7593: [ { #c1127ea9: 68 } ] })>, <#26796f6a: - ({ #d121c0bd: 185 }, + ({ #d121c0bd: 194 }, { #f9c96be9: { #c1127ea9: 102 } }, { #08ec7593: [ { #c1127ea9: 136 } ] })>, <#26796f6a: ({ #d121c0bd: 134 }, { #f9c96be9: { #c1127ea9: 102 } }, { #08ec7593: [ { #c1127ea9: 136 } ] })>, - <#f3f3711a: ({ #d121c0bd: 279 })>, - <#f3f3711a: ({ #d121c0bd: 280 })>, - <#09e09de9: ({ #d121c0bd: 281, #26f32be5: 280 })>, - <#d3d219f7: ({ #d121c0bd: 282 }, { #c1127ea9: 279 })>, - <#d3d219f7: ({ #d121c0bd: 283 }, { #c1127ea9: 281 })>, + <#26796f6a: + ({ #d121c0bd: 289 }, + { #f9c96be9: { #c1127ea9: 102 } }, + { #08ec7593: [ { #c1127ea9: 136 }, { #c1127ea9: 68 } ] })>, + <#26796f6a: + ({ #d121c0bd: 139 }, + { #f9c96be9: { #c1127ea9: 102 } }, + { #08ec7593: [ { #c1127ea9: 136 }, { #c1127ea9: 68 } ] })>, + <#f3f3711a: ({ #d121c0bd: 290 })>, + <#f3f3711a: ({ #d121c0bd: 291 })>, + <#09e09de9: ({ #d121c0bd: 292, #26f32be5: 291 })>, + <#d3d219f7: ({ #d121c0bd: 293 }, { #c1127ea9: 290 })>, + <#d3d219f7: ({ #d121c0bd: 294 }, { #c1127ea9: 292 })>, <#09e09de9: ({ #d121c0bd: 103, #26f32be5: 11 })>, <#d3d219f7: ({ #d121c0bd: 63 }, { #c1127ea9: 103 })>, <#da0c5ecf: - ({ #d121c0bd: 284 }, + ({ #d121c0bd: 295 }, { #cd26765d: { #c1127ea9: 11 }, #11302019: 4 }, 10)>, - <#f3f3711a: ({ #d121c0bd: 285 })>, - <#09e09de9: ({ #d121c0bd: 286, #26f32be5: 285 })>, - <#d3d219f7: ({ #d121c0bd: 287 }, { #c1127ea9: 286 })>, - <#f3f3711a: ({ #d121c0bd: 288 })>, - <#09e09de9: ({ #d121c0bd: 289, #26f32be5: 288 })>, - <#d3d219f7: ({ #d121c0bd: 290 }, { #c1127ea9: 289 })>, + <#f3f3711a: ({ #d121c0bd: 296 })>, + <#09e09de9: ({ #d121c0bd: 297, #26f32be5: 296 })>, + <#d3d219f7: ({ #d121c0bd: 298 }, { #c1127ea9: 297 })>, + <#f3f3711a: ({ #d121c0bd: 299 })>, + <#09e09de9: ({ #d121c0bd: 300, #26f32be5: 299 })>, + <#d3d219f7: ({ #d121c0bd: 301 }, { #c1127ea9: 300 })>, <#09e09de9: ({ #d121c0bd: 110, #26f32be5: 8 })>, <#d3d219f7: ({ #d121c0bd: 75 }, { #c1127ea9: 110 })>, <#da0c5ecf: - ({ #d121c0bd: 291 }, + ({ #d121c0bd: 302 }, { #cd26765d: { #c1127ea9: 8 }, #11302019: 4 }, 10)>, <#da0c5ecf: ({ #d121c0bd: 81 }, { #cd26765d: { #c1127ea9: 30 }, #11302019: 4 }, 10)>, - <#d3d219f7: ({ #d121c0bd: 292 }, { #c1127ea9: 291 })>, - <#d3d219f7: ({ #d121c0bd: 293 }, { #c1127ea9: 81 })>, + <#d3d219f7: ({ #d121c0bd: 303 }, { #c1127ea9: 302 })>, + <#d3d219f7: ({ #d121c0bd: 304 }, { #c1127ea9: 81 })>, <#26796f6a: - ({ #d121c0bd: 294 }, { #f9c96be9: { #c1127ea9: 102 } }, { })>, - <#f3f3711a: ({ #d121c0bd: 295 })>, - <#09e09de9: ({ #d121c0bd: 296, #26f32be5: 295 })>, - <#d3d219f7: ({ #d121c0bd: 297 }, { #c1127ea9: 296 })>, + ({ #d121c0bd: 305 }, { #f9c96be9: { #c1127ea9: 102 } }, { })>, + <#f3f3711a: ({ #d121c0bd: 306 })>, + <#09e09de9: ({ #d121c0bd: 307, #26f32be5: 306 })>, + <#d3d219f7: ({ #d121c0bd: 308 }, { #c1127ea9: 307 })>, <#263b5f37: ({ #d121c0bd: 88, #26f32be5: 25 })>, <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 88 })>, - <#0b08cd60: ({ #d121c0bd: 298 }, { #c1127ea9: 25, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 309 }, { #c1127ea9: 25, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 50 }, { #c1127ea9: 88, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 299 }, + ({ #d121c0bd: 310 }, { #f9c96be9: { #c1127ea9: 102 } }, - { #08ec7593: [ { #c1127ea9: 298 } ] })>, + { #08ec7593: [ { #c1127ea9: 309 } ] })>, <#26796f6a: ({ #d121c0bd: 48 }, { #f9c96be9: { #c1127ea9: 102 } }, { #08ec7593: [ { #c1127ea9: 50 } ] })>, - <#295746e6: ({ #d121c0bd: 300 }, { #c1127ea9: 25 })>, + <#295746e6: ({ #d121c0bd: 311 }, { #c1127ea9: 25 })>, <#295746e6: ({ #d121c0bd: 54 }, { #c1127ea9: 88 })>, <#26796f6a: - ({ #d121c0bd: 301 }, + ({ #d121c0bd: 312 }, { #f9c96be9: { #c1127ea9: 102 } }, - { #08ec7593: [ { #c1127ea9: 300 } ] })>, + { #08ec7593: [ { #c1127ea9: 311 } ] })>, <#26796f6a: ({ #d121c0bd: 52 }, { #f9c96be9: { #c1127ea9: 102 } }, { #08ec7593: [ { #c1127ea9: 54 } ] })>, - <#0b08cd60: ({ #d121c0bd: 302 }, { #c1127ea9: 25 })>, - <#f3f3711a: ({ #d121c0bd: 303 })>, - <#09e09de9: ({ #d121c0bd: 304, #26f32be5: 303 })>, - <#d3d219f7: ({ #d121c0bd: 305 }, { #c1127ea9: 304 })>, + <#0b08cd60: ({ #d121c0bd: 313 }, { #c1127ea9: 25 })>, + <#f3f3711a: ({ #d121c0bd: 314 })>, + <#09e09de9: ({ #d121c0bd: 315, #26f32be5: 314 })>, + <#d3d219f7: ({ #d121c0bd: 316 }, { #c1127ea9: 315 })>, <#09e09de9: ({ #d121c0bd: 117, #26f32be5: 25 })>, <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 117 })>, <#da0c5ecf: - ({ #d121c0bd: 306 }, + ({ #d121c0bd: 317 }, { #cd26765d: { #c1127ea9: 25 }, #11302019: 12 }, 10)>, <#da0c5ecf: ({ #d121c0bd: 97 }, { #cd26765d: { #c1127ea9: 88 }, #11302019: 12 }, 10)>, - <#d3d219f7: ({ #d121c0bd: 307 }, { #c1127ea9: 306 })>, - <#d3d219f7: ({ #d121c0bd: 308 }, { #c1127ea9: 97 })>, + <#d3d219f7: ({ #d121c0bd: 318 }, { #c1127ea9: 317 })>, + <#d3d219f7: ({ #d121c0bd: 319 }, { #c1127ea9: 97 })>, <#26796f6a: - ({ #d121c0bd: 309 }, { #f9c96be9: { #c1127ea9: 102 } }, { })>, - <#f3f3711a: ({ #d121c0bd: 310 })>, - <#09e09de9: ({ #d121c0bd: 311, #26f32be5: 310 })>, - <#d3d219f7: ({ #d121c0bd: 312 }, { #c1127ea9: 311 })>, + ({ #d121c0bd: 320 }, { #f9c96be9: { #c1127ea9: 102 } }, { })>, + <#f3f3711a: ({ #d121c0bd: 321 })>, + <#09e09de9: ({ #d121c0bd: 322, #26f32be5: 321 })>, + <#d3d219f7: ({ #d121c0bd: 323 }, { #c1127ea9: 322 })>, <#da0c5ecf: - ({ #d121c0bd: 150 }, + ({ #d121c0bd: 159 }, { #cd26765d: { #c1127ea9: 11 }, #11302019: 4 }, 3)>, - <#f3f3711a: ({ #d121c0bd: 313 })>, - <#09e09de9: ({ #d121c0bd: 314, #26f32be5: 313 })>, - <#d3d219f7: ({ #d121c0bd: 315 }, { #c1127ea9: 314 })>, - <#f3f3711a: ({ #d121c0bd: 316 })>, - <#09e09de9: ({ #d121c0bd: 317, #26f32be5: 316 })>, - <#d3d219f7: ({ #d121c0bd: 318 }, { #c1127ea9: 317 })>, + <#f3f3711a: ({ #d121c0bd: 324 })>, + <#09e09de9: ({ #d121c0bd: 325, #26f32be5: 324 })>, + <#d3d219f7: ({ #d121c0bd: 326 }, { #c1127ea9: 325 })>, + <#f3f3711a: ({ #d121c0bd: 327 })>, + <#09e09de9: ({ #d121c0bd: 328, #26f32be5: 327 })>, + <#d3d219f7: ({ #d121c0bd: 329 }, { #c1127ea9: 328 })>, <#da0c5ecf: - ({ #d121c0bd: 319 }, + ({ #d121c0bd: 330 }, { #cd26765d: { #c1127ea9: 25 }, #11302019: 12 }, 4)>, <#da0c5ecf: - ({ #d121c0bd: 172 }, + ({ #d121c0bd: 181 }, { #cd26765d: { #c1127ea9: 88 }, #11302019: 12 }, 4)>, - <#f3f3711a: ({ #d121c0bd: 320 })>, - <#09e09de9: ({ #d121c0bd: 321, #26f32be5: 320 })>, - <#d3d219f7: ({ #d121c0bd: 322 }, { #c1127ea9: 321 })>, + <#f3f3711a: ({ #d121c0bd: 331 })>, + <#09e09de9: ({ #d121c0bd: 332, #26f32be5: 331 })>, + <#d3d219f7: ({ #d121c0bd: 333 }, { #c1127ea9: 332 })>, <#26796f6a: - ({ #d121c0bd: 323 }, + ({ #d121c0bd: 334 }, { #f9c96be9: { #c1127ea9: 136 } }, { #08ec7593: [ @@ -3230,7 +3320,7 @@ ] })>, <#26796f6a: - ({ #d121c0bd: 175 }, + ({ #d121c0bd: 184 }, { #f9c96be9: { #c1127ea9: 136 } }, { #08ec7593: [ @@ -3239,9 +3329,9 @@ { #c1127ea9: 136 } ] })>, - <#0b08cd60: ({ #d121c0bd: 324 }, { #c1127ea9: 11 })>, + <#0b08cd60: ({ #d121c0bd: 335 }, { #c1127ea9: 11 })>, <#26796f6a: - ({ #d121c0bd: 325 }, + ({ #d121c0bd: 336 }, { #f9c96be9: { #c1127ea9: 102 } }, { #08ec7593: [ @@ -3250,17 +3340,17 @@ { #c1127ea9: 136 } ] })>, - <#f3f3711a: ({ #d121c0bd: 326 })>, - <#09e09de9: ({ #d121c0bd: 327, #26f32be5: 326 })>, - <#d3d219f7: ({ #d121c0bd: 328 }, { #c1127ea9: 327 })>, - <#0098a8c5: ({ #d121c0bd: 329 }, { #fcd148e8: 255 })>, - <#2e3d736c: ({ #d121c0bd: 330 }, { #c1127ea9: 329 })>, + <#f3f3711a: ({ #d121c0bd: 337 })>, + <#09e09de9: ({ #d121c0bd: 338, #26f32be5: 337 })>, + <#d3d219f7: ({ #d121c0bd: 339 }, { #c1127ea9: 338 })>, + <#0098a8c5: ({ #d121c0bd: 340 }, { #fcd148e8: 265 })>, + <#2e3d736c: ({ #d121c0bd: 341 }, { #c1127ea9: 340 })>, <#19e1ef85: - ({ #d121c0bd: 331, #26f32be5: 330 }, - { #0b680f7d: { #c1127ea9: 330 }, #c3687459: 332 })>, + ({ #d121c0bd: 342, #26f32be5: 341 }, + { #0b680f7d: { #c1127ea9: 341 }, #c3687459: 343 })>, <#19e1ef85: - ({ #d121c0bd: 201, #26f32be5: 330 }, - { #0b680f7d: { #c1127ea9: 331 }, #c3687459: 200 })>, + ({ #d121c0bd: 210, #26f32be5: 341 }, + { #0b680f7d: { #c1127ea9: 342 }, #c3687459: 209 })>, <#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 704cc5126db..3846cf1e695 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 @@ -237,42 +237,43 @@ <#22d546dd: ({ #d121c0bd: 72 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 73 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 74 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 75 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 76 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 77 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 78 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 79 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 80 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 81 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 21 })>, - <#22d546dd: ({ #d121c0bd: 83 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 84 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 85 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 86 }, 87)>, - <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 23, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 26, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 26 })>, - <#d80cb60b: ({ #d121c0bd: 91 }, 92)>, + <#22d546dd: ({ #d121c0bd: 75 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 76 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 77 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 78 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 79 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 80 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 81 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 82 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 21 })>, + <#22d546dd: ({ #d121c0bd: 84 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 85 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 86 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 87 }, 88)>, + <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 23, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 26, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 26 })>, + <#d80cb60b: ({ #d121c0bd: 92 }, 93)>, <#da0c5ecf: - ({ #d121c0bd: 93 }, - { #cd26765d: { #c1127ea9: 91 }, #11302019: 24 }, + ({ #d121c0bd: 94 }, + { #cd26765d: { #c1127ea9: 92 }, #11302019: 24 }, 1)>, <#26796f6a: - ({ #d121c0bd: 94 }, { #f9c96be9: { #c1127ea9: 21 } }, { })>, + ({ #d121c0bd: 95 }, { #f9c96be9: { #c1127ea9: 21 } }, { })>, <#26796f6a: ({ #d121c0bd: 8 }, { #f9c96be9: { #c1127ea9: 21 } }, { })>, <#26796f6a: ({ #d121c0bd: 12 }, { #f9c96be9: { #c1127ea9: 23 } }, { })>, - <#d3d219f7: ({ #d121c0bd: 95 }, { #c1127ea9: 90 })>, - <#d3d219f7: ({ #d121c0bd: 96 }, { #c1127ea9: 94 })>, + <#d3d219f7: ({ #d121c0bd: 96 }, { #c1127ea9: 91 })>, + <#d3d219f7: ({ #d121c0bd: 97 }, { #c1127ea9: 95 })>, <#d3d219f7: ({ #d121c0bd: 20 }, { #c1127ea9: 8 })>, - <#0098a8c5: ({ #d121c0bd: 97 }, { #fcd148e8: 79 })>, - <#2e3d736c: ({ #d121c0bd: 98 }, { #c1127ea9: 97 })>, + <#0098a8c5: ({ #d121c0bd: 98 }, { #fcd148e8: 80 })>, + <#2e3d736c: ({ #d121c0bd: 99 }, { #c1127ea9: 98 })>, <#19e1ef85: - ({ #d121c0bd: 99, #26f32be5: 98 }, - { #0b680f7d: { #c1127ea9: 98 }, #c3687459: 100 })>, + ({ #d121c0bd: 100, #26f32be5: 99 }, + { #0b680f7d: { #c1127ea9: 99 }, #c3687459: 101 })>, <#19e1ef85: - ({ #d121c0bd: 25, #26f32be5: 98 }, - { #0b680f7d: { #c1127ea9: 99 }, #c3687459: 24 })>, + ({ #d121c0bd: 25, #26f32be5: 99 }, + { #0b680f7d: { #c1127ea9: 100 }, #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 721fa9dedc2..7d3110986c9 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 @@ -145,47 +145,48 @@ <#22d546dd: ({ #d121c0bd: 64 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 65 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 66 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 67 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 68 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 69 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 70 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 71 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 72 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 73 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 74 }, { #c1127ea9: 15 })>, - <#22d546dd: ({ #d121c0bd: 75 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 76 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 77 }, <#f65b235f>)>, - <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 73 })>, - <#0098a8c5: ({ #d121c0bd: 79 }, { #fcd148e8: 71 })>, - <#2e3d736c: ({ #d121c0bd: 80 }, { #c1127ea9: 79 })>, - <#0098a8c5: ({ #d121c0bd: 81 }, { #fcd148e8: 72 })>, - <#2e3d736c: ({ #d121c0bd: 82 }, { #c1127ea9: 81 })>, - <#2374f4e7: ({ #d121c0bd: 83 }, 8)>, - <#d80cb60b: ({ #d121c0bd: 84 }, 85)>, - <#d3d219f7: ({ #d121c0bd: 86 }, { #c1127ea9: 20, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 87 }, { #c1127ea9: 17, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 17 })>, - <#d80cb60b: ({ #d121c0bd: 89 }, 90)>, + <#22d546dd: ({ #d121c0bd: 67 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 68 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 69 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 70 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 71 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 72 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 73 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 74 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 75 }, { #c1127ea9: 15 })>, + <#22d546dd: ({ #d121c0bd: 76 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 77 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 78 }, <#f65b235f>)>, + <#d3d219f7: ({ #d121c0bd: 79 }, { #c1127ea9: 74 })>, + <#0098a8c5: ({ #d121c0bd: 80 }, { #fcd148e8: 72 })>, + <#2e3d736c: ({ #d121c0bd: 81 }, { #c1127ea9: 80 })>, + <#0098a8c5: ({ #d121c0bd: 82 }, { #fcd148e8: 73 })>, + <#2e3d736c: ({ #d121c0bd: 83 }, { #c1127ea9: 82 })>, + <#2374f4e7: ({ #d121c0bd: 84 }, 8)>, + <#d80cb60b: ({ #d121c0bd: 85 }, 86)>, + <#d3d219f7: ({ #d121c0bd: 87 }, { #c1127ea9: 20, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 17, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 17 })>, + <#d80cb60b: ({ #d121c0bd: 90 }, 91)>, <#da0c5ecf: - ({ #d121c0bd: 91 }, - { #cd26765d: { #c1127ea9: 89 }, #11302019: 24 }, + ({ #d121c0bd: 92 }, + { #cd26765d: { #c1127ea9: 90 }, #11302019: 24 }, 1)>, - <#f3f3711a: ({ #d121c0bd: 92 })>, <#f3f3711a: ({ #d121c0bd: 93 })>, - <#26796f6a: - ({ #d121c0bd: 94 }, - { #f9c96be9: { #c1127ea9: 74 } }, - { #08ec7593: [ { #c1127ea9: 92 } ] })>, + <#f3f3711a: ({ #d121c0bd: 94 })>, <#26796f6a: ({ #d121c0bd: 95 }, - { #f9c96be9: { #c1127ea9: 74 } }, + { #f9c96be9: { #c1127ea9: 75 } }, { #08ec7593: [ { #c1127ea9: 93 } ] })>, + <#26796f6a: + ({ #d121c0bd: 96 }, + { #f9c96be9: { #c1127ea9: 75 } }, + { #08ec7593: [ { #c1127ea9: 94 } ] })>, <#19e1ef85: - ({ #d121c0bd: 6, #26f32be5: 80 }, - { #0b680f7d: { #c1127ea9: 80 }, #c3687459: 5 })>, + ({ #d121c0bd: 6, #26f32be5: 81 }, + { #0b680f7d: { #c1127ea9: 81 }, #c3687459: 5 })>, <#19e1ef85: - ({ #d121c0bd: 14, #26f32be5: 80 }, + ({ #d121c0bd: 14, #26f32be5: 81 }, { #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 61fbd1b44af..83263b4f64a 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/optional.m.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/optional.m.exp @@ -908,48 +908,49 @@ <#22d546dd: ({ #d121c0bd: 98 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 99 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 100 }, <#0d506118>)>, + <#22d546dd: ({ #d121c0bd: 101 }, <#f9ed64cb>)>, <#22d546dd: ({ #d121c0bd: 44 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 101 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 102 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 103 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 104 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 105 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 106 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 107 }, { #c1127ea9: 17 })>, - <#22d546dd: ({ #d121c0bd: 108 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 109 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 110 }, <#f65b235f>)>, - <#d3d219f7: ({ #d121c0bd: 111 }, { #c1127ea9: 106 })>, - <#0098a8c5: ({ #d121c0bd: 112 }, { #fcd148e8: 104 })>, - <#2e3d736c: ({ #d121c0bd: 113 }, { #c1127ea9: 112 })>, - <#0098a8c5: ({ #d121c0bd: 114 }, { #fcd148e8: 105 })>, - <#2e3d736c: ({ #d121c0bd: 115 }, { #c1127ea9: 114 })>, - <#2374f4e7: ({ #d121c0bd: 116 }, 9)>, - <#d80cb60b: ({ #d121c0bd: 117 }, 118)>, - <#d3d219f7: ({ #d121c0bd: 119 }, { #c1127ea9: 56, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 120 }, { #c1127ea9: 53, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 121 }, { #c1127ea9: 53 })>, - <#d80cb60b: ({ #d121c0bd: 122 }, 123)>, + <#22d546dd: ({ #d121c0bd: 102 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 103 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 104 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 105 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 106 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 107 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 108 }, { #c1127ea9: 17 })>, + <#22d546dd: ({ #d121c0bd: 109 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 110 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 111 }, <#f65b235f>)>, + <#d3d219f7: ({ #d121c0bd: 112 }, { #c1127ea9: 107 })>, + <#0098a8c5: ({ #d121c0bd: 113 }, { #fcd148e8: 105 })>, + <#2e3d736c: ({ #d121c0bd: 114 }, { #c1127ea9: 113 })>, + <#0098a8c5: ({ #d121c0bd: 115 }, { #fcd148e8: 106 })>, + <#2e3d736c: ({ #d121c0bd: 116 }, { #c1127ea9: 115 })>, + <#2374f4e7: ({ #d121c0bd: 117 }, 9)>, + <#d80cb60b: ({ #d121c0bd: 118 }, 119)>, + <#d3d219f7: ({ #d121c0bd: 120 }, { #c1127ea9: 56, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 121 }, { #c1127ea9: 53, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 122 }, { #c1127ea9: 53 })>, + <#d80cb60b: ({ #d121c0bd: 123 }, 124)>, <#da0c5ecf: - ({ #d121c0bd: 124 }, - { #cd26765d: { #c1127ea9: 122 }, #11302019: 24 }, + ({ #d121c0bd: 125 }, + { #cd26765d: { #c1127ea9: 123 }, #11302019: 24 }, 1)>, - <#2374f4e7: ({ #d121c0bd: 125 }, 13)>, + <#2374f4e7: ({ #d121c0bd: 126 }, 13)>, <#19e1ef85: - ({ #d121c0bd: 7, #26f32be5: 113 }, - { #0b680f7d: { #c1127ea9: 113 }, #c3687459: 6 })>, + ({ #d121c0bd: 7, #26f32be5: 114 }, + { #0b680f7d: { #c1127ea9: 114 }, #c3687459: 6 })>, <#19e1ef85: - ({ #d121c0bd: 51, #26f32be5: 113 }, + ({ #d121c0bd: 51, #26f32be5: 114 }, { #0b680f7d: { #c1127ea9: 7 }, #c3687459: 50 })>, <#19e1ef85: - ({ #d121c0bd: 5, #26f32be5: 111 }, - { #0b680f7d: { #c1127ea9: 111 }, #c3687459: 4 })>, - <#2374f4e7: ({ #d121c0bd: 126 }, 20)>, - <#263b5f37: ({ #d121c0bd: 127, #26f32be5: 113 })>, + ({ #d121c0bd: 5, #26f32be5: 112 }, + { #0b680f7d: { #c1127ea9: 112 }, #c3687459: 4 })>, + <#2374f4e7: ({ #d121c0bd: 127 }, 20)>, + <#263b5f37: ({ #d121c0bd: 128, #26f32be5: 114 })>, <#0098a8c5: - ({ #d121c0bd: 128 }, { #fcd148e8: 104, #0b037c51: [ 15 ] })>, - <#2e3d736c: ({ #d121c0bd: 22 }, { #c1127ea9: 128 })>, - <#2e3d736c: ({ #d121c0bd: 27 }, { #c1127ea9: 126 })>, + ({ #d121c0bd: 129 }, { #fcd148e8: 105, #0b037c51: [ 15 ] })>, + <#2e3d736c: ({ #d121c0bd: 22 }, { #c1127ea9: 129 })>, + <#2e3d736c: ({ #d121c0bd: 27 }, { #c1127ea9: 127 })>, <#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 6ec8ecd04cc..a7c012c7498 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 @@ -270,40 +270,40 @@ <#22d546dd: ({ #d121c0bd: 74 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 75 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 76 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 77 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 78 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 79 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 80 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 81 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 82 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 83 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 84 }, { #c1127ea9: 28 })>, - <#22d546dd: ({ #d121c0bd: 85 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 86 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 87 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 88 }, 89)>, - <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 12, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 25, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 92 }, { #c1127ea9: 25 })>, - <#d80cb60b: ({ #d121c0bd: 93 }, 94)>, + <#22d546dd: ({ #d121c0bd: 77 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 78 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 79 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 80 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 81 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 82 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 83 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 84 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 85 }, { #c1127ea9: 28 })>, + <#22d546dd: ({ #d121c0bd: 86 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 87 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 88 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 89 }, 90)>, + <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 12, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 92 }, { #c1127ea9: 25, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 93 }, { #c1127ea9: 25 })>, + <#d80cb60b: ({ #d121c0bd: 94 }, 95)>, <#da0c5ecf: - ({ #d121c0bd: 95 }, - { #cd26765d: { #c1127ea9: 93 }, #11302019: 24 }, + ({ #d121c0bd: 96 }, + { #cd26765d: { #c1127ea9: 94 }, #11302019: 24 }, 1)>, <#f3f3711a: ({ #d121c0bd: 21 })>, - <#f3f3711a: ({ #d121c0bd: 96 })>, - <#ece2635f: ({ #d121c0bd: 97 })>, + <#f3f3711a: ({ #d121c0bd: 97 })>, <#ece2635f: ({ #d121c0bd: 98 })>, - <#d49f978d: ({ #d121c0bd: 99 })>, + <#ece2635f: ({ #d121c0bd: 99 })>, + <#d49f978d: ({ #d121c0bd: 100 })>, <#f3f3711a: ({ #d121c0bd: 16 })>, - <#ece2635f: ({ #d121c0bd: 100 })>, <#ece2635f: ({ #d121c0bd: 101 })>, - <#d49f978d: ({ #d121c0bd: 9 })>, <#ece2635f: ({ #d121c0bd: 102 })>, + <#d49f978d: ({ #d121c0bd: 9 })>, <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 9 })>, <#26796f6a: ({ #d121c0bd: 19 }, { #f9c96be9: { #c1127ea9: 28 } }, { })>, - <#0098a8c5: ({ #d121c0bd: 104 }, { #fcd148e8: 81 })>, + <#0098a8c5: ({ #d121c0bd: 104 }, { #fcd148e8: 82 })>, <#2e3d736c: ({ #d121c0bd: 105 }, { #c1127ea9: 104 })>, <#19e1ef85: ({ #d121c0bd: 106, #26f32be5: 105 }, diff --git a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/struct.cpp.exp b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/struct.cpp.exp index 351c4444e9f..2c6f0500027 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/struct.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/struct.cpp.exp @@ -534,25 +534,26 @@ <#22d546dd: ({ #d121c0bd: 101 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 102 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 103 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 104 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 105 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 106 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 107 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 108 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 109 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 110 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 111 }, { #c1127ea9: 54 })>, - <#22d546dd: ({ #d121c0bd: 112 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 113 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 114 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 115 }, 116)>, - <#d3d219f7: ({ #d121c0bd: 117 }, { #c1127ea9: 44, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 118 }, { #c1127ea9: 56, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 119 }, { #c1127ea9: 56 })>, - <#d80cb60b: ({ #d121c0bd: 120 }, 121)>, + <#22d546dd: ({ #d121c0bd: 104 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 105 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 106 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 107 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 108 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 109 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 110 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 111 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 112 }, { #c1127ea9: 54 })>, + <#22d546dd: ({ #d121c0bd: 113 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 114 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 115 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 116 }, 117)>, + <#d3d219f7: ({ #d121c0bd: 118 }, { #c1127ea9: 44, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 119 }, { #c1127ea9: 56, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 120 }, { #c1127ea9: 56 })>, + <#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: @@ -560,43 +561,43 @@ <#d80cb60b: ({ #d121c0bd: 18 }, 17)>, <#263b5f37: ({ #d121c0bd: 33, #26f32be5: 18 })>, <#26796f6a: - ({ #d121c0bd: 123 }, { #f9c96be9: { #c1127ea9: 54 } }, { })>, - <#0b08cd60: ({ #d121c0bd: 124 }, { #c1127ea9: 18, #ea1a680e: true })>, + ({ #d121c0bd: 124 }, { #f9c96be9: { #c1127ea9: 54 } }, { })>, + <#0b08cd60: ({ #d121c0bd: 125 }, { #c1127ea9: 18, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 26 }, { #c1127ea9: 33, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 125 }, + ({ #d121c0bd: 126 }, { #f9c96be9: { #c1127ea9: 54 } }, - { #08ec7593: [ { #c1127ea9: 124 } ] })>, + { #08ec7593: [ { #c1127ea9: 125 } ] })>, <#26796f6a: ({ #d121c0bd: 24 }, { #f9c96be9: { #c1127ea9: 54 } }, { #08ec7593: [ { #c1127ea9: 26 } ] })>, - <#295746e6: ({ #d121c0bd: 126 }, { #c1127ea9: 18 })>, + <#295746e6: ({ #d121c0bd: 127 }, { #c1127ea9: 18 })>, <#295746e6: ({ #d121c0bd: 30 }, { #c1127ea9: 33 })>, <#26796f6a: - ({ #d121c0bd: 127 }, + ({ #d121c0bd: 128 }, { #f9c96be9: { #c1127ea9: 54 } }, - { #08ec7593: [ { #c1127ea9: 126 } ] })>, + { #08ec7593: [ { #c1127ea9: 127 } ] })>, <#26796f6a: ({ #d121c0bd: 28 }, { #f9c96be9: { #c1127ea9: 54 } }, { #08ec7593: [ { #c1127ea9: 30 } ] })>, <#26796f6a: ({ #d121c0bd: 21 }, { #f9c96be9: { #c1127ea9: 54 } }, { })>, - <#d3d219f7: ({ #d121c0bd: 128 }, { #c1127ea9: 18 })>, - <#d3d219f7: ({ #d121c0bd: 129 }, { #c1127ea9: 33 })>, - <#0b08cd60: ({ #d121c0bd: 130 }, { #c1127ea9: 18 })>, + <#d3d219f7: ({ #d121c0bd: 129 }, { #c1127ea9: 18 })>, + <#d3d219f7: ({ #d121c0bd: 130 }, { #c1127ea9: 33 })>, + <#0b08cd60: ({ #d121c0bd: 131 }, { #c1127ea9: 18 })>, <#263b5f37: ({ #d121c0bd: 36, #26f32be5: 8 })>, <#d80cb60b: ({ #d121c0bd: 41 }, 40)>, <#d80cb60b: ({ #d121c0bd: 48 }, 47)>, - <#0098a8c5: ({ #d121c0bd: 131 }, { #fcd148e8: 108 })>, - <#2e3d736c: ({ #d121c0bd: 132 }, { #c1127ea9: 131 })>, + <#0098a8c5: ({ #d121c0bd: 132 }, { #fcd148e8: 109 })>, + <#2e3d736c: ({ #d121c0bd: 133 }, { #c1127ea9: 132 })>, <#19e1ef85: - ({ #d121c0bd: 133, #26f32be5: 132 }, - { #0b680f7d: { #c1127ea9: 132 }, #c3687459: 134 })>, + ({ #d121c0bd: 134, #26f32be5: 133 }, + { #0b680f7d: { #c1127ea9: 133 }, #c3687459: 135 })>, <#19e1ef85: - ({ #d121c0bd: 53, #26f32be5: 132 }, - { #0b680f7d: { #c1127ea9: 133 }, #c3687459: 52 })>, + ({ #d121c0bd: 53, #26f32be5: 133 }, + { #0b680f7d: { #c1127ea9: 134 }, #c3687459: 52 })>, <#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 ce6b258cde7..580e7ba133e 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/template_instantiations.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/template_instantiations.cpp.exp @@ -1772,387 +1772,388 @@ <#22d546dd: ({ #d121c0bd: 239 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 240 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 241 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 242 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 243 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 244 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 245 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 246 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 247 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 248 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 249 }, { #c1127ea9: 191 })>, - <#22d546dd: ({ #d121c0bd: 250 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 251 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 252 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 253 }, 254)>, - <#d3d219f7: ({ #d121c0bd: 255 }, { #c1127ea9: 10, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 256 }, { #c1127ea9: 193, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 257 }, { #c1127ea9: 193 })>, - <#d80cb60b: ({ #d121c0bd: 258 }, 259)>, + <#22d546dd: ({ #d121c0bd: 242 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 243 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 244 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 245 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 246 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 247 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 248 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 249 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 250 }, { #c1127ea9: 191 })>, + <#22d546dd: ({ #d121c0bd: 251 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 252 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 253 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 254 }, 255)>, + <#d3d219f7: ({ #d121c0bd: 256 }, { #c1127ea9: 10, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 257 }, { #c1127ea9: 193, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 258 }, { #c1127ea9: 193 })>, + <#d80cb60b: ({ #d121c0bd: 259 }, 260)>, <#da0c5ecf: - ({ #d121c0bd: 260 }, - { #cd26765d: { #c1127ea9: 258 }, #11302019: 24 }, + ({ #d121c0bd: 261 }, + { #cd26765d: { #c1127ea9: 259 }, #11302019: 24 }, 1)>, - <#f3f3711a: ({ #d121c0bd: 261 })>, <#f3f3711a: ({ #d121c0bd: 262 })>, - <#109a76a0: ({ #d121c0bd: 263 })>, + <#f3f3711a: ({ #d121c0bd: 263 })>, <#109a76a0: ({ #d121c0bd: 264 })>, - <#ece2635f: ({ #d121c0bd: 265 })>, + <#109a76a0: ({ #d121c0bd: 265 })>, <#ece2635f: ({ #d121c0bd: 266 })>, - <#d49f978d: ({ #d121c0bd: 267 })>, + <#ece2635f: ({ #d121c0bd: 267 })>, + <#d49f978d: ({ #d121c0bd: 268 })>, <#d80cb60b: ({ #d121c0bd: 9 }, 8)>, - <#ece2635f: ({ #d121c0bd: 268, #26f32be5: 9 })>, - <#263b5f37: ({ #d121c0bd: 269, #26f32be5: 9 })>, + <#ece2635f: ({ #d121c0bd: 269, #26f32be5: 9 })>, + <#263b5f37: ({ #d121c0bd: 270, #26f32be5: 9 })>, <#d80cb60b: ({ #d121c0bd: 12 }, 11)>, - <#ece2635f: ({ #d121c0bd: 270, #26f32be5: 12 })>, + <#ece2635f: ({ #d121c0bd: 271, #26f32be5: 12 })>, <#263b5f37: ({ #d121c0bd: 26, #26f32be5: 12 })>, - <#26796f6a: - ({ #d121c0bd: 271 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, <#26796f6a: ({ #d121c0bd: 272 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, - <#263b5f37: ({ #d121c0bd: 273, #26f32be5: 12 })>, - <#0b08cd60: ({ #d121c0bd: 274 }, { #c1127ea9: 12, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 20 }, { #c1127ea9: 273, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 275 }, + ({ #d121c0bd: 273 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, + <#263b5f37: ({ #d121c0bd: 274, #26f32be5: 12 })>, + <#0b08cd60: ({ #d121c0bd: 275 }, { #c1127ea9: 12, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 20 }, { #c1127ea9: 274, #ea1a680e: true })>, + <#26796f6a: + ({ #d121c0bd: 276 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 274 } ] })>, + { #08ec7593: [ { #c1127ea9: 275 } ] })>, <#26796f6a: ({ #d121c0bd: 18 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 20 } ] })>, - <#295746e6: ({ #d121c0bd: 276 }, { #c1127ea9: 12 })>, - <#295746e6: ({ #d121c0bd: 24 }, { #c1127ea9: 273 })>, + <#295746e6: ({ #d121c0bd: 277 }, { #c1127ea9: 12 })>, + <#295746e6: ({ #d121c0bd: 24 }, { #c1127ea9: 274 })>, <#26796f6a: - ({ #d121c0bd: 277 }, + ({ #d121c0bd: 278 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 276 } ] })>, + { #08ec7593: [ { #c1127ea9: 277 } ] })>, <#26796f6a: ({ #d121c0bd: 22 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 24 } ] })>, <#26796f6a: ({ #d121c0bd: 15 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, - <#d3d219f7: ({ #d121c0bd: 278 }, { #c1127ea9: 12 })>, - <#d3d219f7: ({ #d121c0bd: 279 }, { #c1127ea9: 26 })>, - <#0b08cd60: ({ #d121c0bd: 280 }, { #c1127ea9: 12 })>, - <#e3120d1e: ({ #d121c0bd: 281, #26f32be5: 250 }, { #c1127ea9: 250 })>, + <#d3d219f7: ({ #d121c0bd: 279 }, { #c1127ea9: 12 })>, + <#d3d219f7: ({ #d121c0bd: 280 }, { #c1127ea9: 26 })>, + <#0b08cd60: ({ #d121c0bd: 281 }, { #c1127ea9: 12 })>, + <#e3120d1e: ({ #d121c0bd: 282, #26f32be5: 251 }, { #c1127ea9: 251 })>, <#19e1ef85: - ({ #d121c0bd: 29, #26f32be5: 250 }, - { #0b680f7d: { #c1127ea9: 281 }, #c3687459: 28 })>, - <#263b5f37: ({ #d121c0bd: 282, #26f32be5: 250 })>, - <#ece2635f: ({ #d121c0bd: 283 })>, + ({ #d121c0bd: 29, #26f32be5: 251 }, + { #0b680f7d: { #c1127ea9: 282 }, #c3687459: 28 })>, + <#263b5f37: ({ #d121c0bd: 283, #26f32be5: 251 })>, <#ece2635f: ({ #d121c0bd: 284 })>, - <#d49f978d: ({ #d121c0bd: 285 })>, + <#ece2635f: ({ #d121c0bd: 285 })>, + <#d49f978d: ({ #d121c0bd: 286 })>, <#d80cb60b: ({ #d121c0bd: 32 }, 31)>, - <#ece2635f: ({ #d121c0bd: 286, #26f32be5: 32 })>, + <#ece2635f: ({ #d121c0bd: 287, #26f32be5: 32 })>, <#263b5f37: ({ #d121c0bd: 45, #26f32be5: 32 })>, <#26796f6a: - ({ #d121c0bd: 287 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, - <#263b5f37: ({ #d121c0bd: 288, #26f32be5: 32 })>, - <#0b08cd60: ({ #d121c0bd: 289 }, { #c1127ea9: 32, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 39 }, { #c1127ea9: 288, #ea1a680e: true })>, + ({ #d121c0bd: 288 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, + <#263b5f37: ({ #d121c0bd: 289, #26f32be5: 32 })>, + <#0b08cd60: ({ #d121c0bd: 290 }, { #c1127ea9: 32, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 39 }, { #c1127ea9: 289, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 290 }, + ({ #d121c0bd: 291 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 289 } ] })>, + { #08ec7593: [ { #c1127ea9: 290 } ] })>, <#26796f6a: ({ #d121c0bd: 37 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 39 } ] })>, - <#295746e6: ({ #d121c0bd: 291 }, { #c1127ea9: 32 })>, - <#295746e6: ({ #d121c0bd: 43 }, { #c1127ea9: 288 })>, + <#295746e6: ({ #d121c0bd: 292 }, { #c1127ea9: 32 })>, + <#295746e6: ({ #d121c0bd: 43 }, { #c1127ea9: 289 })>, <#26796f6a: - ({ #d121c0bd: 292 }, + ({ #d121c0bd: 293 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 291 } ] })>, + { #08ec7593: [ { #c1127ea9: 292 } ] })>, <#26796f6a: ({ #d121c0bd: 41 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 43 } ] })>, - <#d3d219f7: ({ #d121c0bd: 293 }, { #c1127ea9: 32 })>, - <#d3d219f7: ({ #d121c0bd: 294 }, { #c1127ea9: 45 })>, - <#0b08cd60: ({ #d121c0bd: 295 }, { #c1127ea9: 32 })>, - <#ece2635f: ({ #d121c0bd: 296 })>, + <#d3d219f7: ({ #d121c0bd: 294 }, { #c1127ea9: 32 })>, + <#d3d219f7: ({ #d121c0bd: 295 }, { #c1127ea9: 45 })>, + <#0b08cd60: ({ #d121c0bd: 296 }, { #c1127ea9: 32 })>, <#ece2635f: ({ #d121c0bd: 297 })>, - <#d49f978d: ({ #d121c0bd: 298 })>, - <#ece2635f: ({ #d121c0bd: 299 })>, + <#ece2635f: ({ #d121c0bd: 298 })>, + <#d49f978d: ({ #d121c0bd: 299 })>, <#ece2635f: ({ #d121c0bd: 300 })>, - <#d49f978d: ({ #d121c0bd: 301 })>, - <#ece2635f: ({ #d121c0bd: 302 })>, + <#ece2635f: ({ #d121c0bd: 301 })>, + <#d49f978d: ({ #d121c0bd: 302 })>, <#ece2635f: ({ #d121c0bd: 303 })>, - <#d49f978d: ({ #d121c0bd: 304 })>, + <#ece2635f: ({ #d121c0bd: 304 })>, + <#d49f978d: ({ #d121c0bd: 305 })>, <#d80cb60b: ({ #d121c0bd: 49 }, 48)>, - <#ece2635f: ({ #d121c0bd: 305, #26f32be5: 49 })>, + <#ece2635f: ({ #d121c0bd: 306, #26f32be5: 49 })>, <#263b5f37: ({ #d121c0bd: 90, #26f32be5: 49 })>, <#26796f6a: - ({ #d121c0bd: 306 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, - <#263b5f37: ({ #d121c0bd: 307, #26f32be5: 49 })>, - <#0b08cd60: ({ #d121c0bd: 308 }, { #c1127ea9: 49, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 56 }, { #c1127ea9: 307, #ea1a680e: true })>, + ({ #d121c0bd: 307 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, + <#263b5f37: ({ #d121c0bd: 308, #26f32be5: 49 })>, + <#0b08cd60: ({ #d121c0bd: 309 }, { #c1127ea9: 49, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 56 }, { #c1127ea9: 308, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 309 }, + ({ #d121c0bd: 310 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 308 } ] })>, + { #08ec7593: [ { #c1127ea9: 309 } ] })>, <#26796f6a: ({ #d121c0bd: 54 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 56 } ] })>, - <#295746e6: ({ #d121c0bd: 310 }, { #c1127ea9: 49 })>, - <#295746e6: ({ #d121c0bd: 60 }, { #c1127ea9: 307 })>, + <#295746e6: ({ #d121c0bd: 311 }, { #c1127ea9: 49 })>, + <#295746e6: ({ #d121c0bd: 60 }, { #c1127ea9: 308 })>, <#26796f6a: - ({ #d121c0bd: 311 }, + ({ #d121c0bd: 312 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 310 } ] })>, + { #08ec7593: [ { #c1127ea9: 311 } ] })>, <#26796f6a: ({ #d121c0bd: 58 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 60 } ] })>, - <#d3d219f7: ({ #d121c0bd: 312 }, { #c1127ea9: 49 })>, - <#d3d219f7: ({ #d121c0bd: 313 }, { #c1127ea9: 90 })>, - <#0b08cd60: ({ #d121c0bd: 314 }, { #c1127ea9: 49 })>, + <#d3d219f7: ({ #d121c0bd: 313 }, { #c1127ea9: 49 })>, + <#d3d219f7: ({ #d121c0bd: 314 }, { #c1127ea9: 90 })>, + <#0b08cd60: ({ #d121c0bd: 315 }, { #c1127ea9: 49 })>, <#d80cb60b: ({ #d121c0bd: 63 }, 62)>, - <#ece2635f: ({ #d121c0bd: 315, #26f32be5: 63 })>, + <#ece2635f: ({ #d121c0bd: 316, #26f32be5: 63 })>, <#263b5f37: ({ #d121c0bd: 93, #26f32be5: 63 })>, <#26796f6a: - ({ #d121c0bd: 316 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, - <#263b5f37: ({ #d121c0bd: 317, #26f32be5: 63 })>, - <#0b08cd60: ({ #d121c0bd: 318 }, { #c1127ea9: 63, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 70 }, { #c1127ea9: 317, #ea1a680e: true })>, + ({ #d121c0bd: 317 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, + <#263b5f37: ({ #d121c0bd: 318, #26f32be5: 63 })>, + <#0b08cd60: ({ #d121c0bd: 319 }, { #c1127ea9: 63, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 70 }, { #c1127ea9: 318, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 319 }, + ({ #d121c0bd: 320 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 318 } ] })>, + { #08ec7593: [ { #c1127ea9: 319 } ] })>, <#26796f6a: ({ #d121c0bd: 68 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 70 } ] })>, - <#295746e6: ({ #d121c0bd: 320 }, { #c1127ea9: 63 })>, - <#295746e6: ({ #d121c0bd: 74 }, { #c1127ea9: 317 })>, + <#295746e6: ({ #d121c0bd: 321 }, { #c1127ea9: 63 })>, + <#295746e6: ({ #d121c0bd: 74 }, { #c1127ea9: 318 })>, <#26796f6a: - ({ #d121c0bd: 321 }, + ({ #d121c0bd: 322 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 320 } ] })>, + { #08ec7593: [ { #c1127ea9: 321 } ] })>, <#26796f6a: ({ #d121c0bd: 72 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 74 } ] })>, - <#d3d219f7: ({ #d121c0bd: 322 }, { #c1127ea9: 63 })>, - <#d3d219f7: ({ #d121c0bd: 323 }, { #c1127ea9: 93 })>, - <#0b08cd60: ({ #d121c0bd: 324 }, { #c1127ea9: 63 })>, + <#d3d219f7: ({ #d121c0bd: 323 }, { #c1127ea9: 63 })>, + <#d3d219f7: ({ #d121c0bd: 324 }, { #c1127ea9: 93 })>, + <#0b08cd60: ({ #d121c0bd: 325 }, { #c1127ea9: 63 })>, <#d80cb60b: ({ #d121c0bd: 77 }, 76)>, - <#ece2635f: ({ #d121c0bd: 325, #26f32be5: 77 })>, + <#ece2635f: ({ #d121c0bd: 326, #26f32be5: 77 })>, <#263b5f37: ({ #d121c0bd: 96, #26f32be5: 77 })>, <#26796f6a: - ({ #d121c0bd: 326 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, - <#263b5f37: ({ #d121c0bd: 327, #26f32be5: 77 })>, - <#0b08cd60: ({ #d121c0bd: 328 }, { #c1127ea9: 77, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 84 }, { #c1127ea9: 327, #ea1a680e: true })>, + ({ #d121c0bd: 327 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, + <#263b5f37: ({ #d121c0bd: 328, #26f32be5: 77 })>, + <#0b08cd60: ({ #d121c0bd: 329 }, { #c1127ea9: 77, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 84 }, { #c1127ea9: 328, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 329 }, + ({ #d121c0bd: 330 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 328 } ] })>, + { #08ec7593: [ { #c1127ea9: 329 } ] })>, <#26796f6a: ({ #d121c0bd: 82 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 84 } ] })>, - <#295746e6: ({ #d121c0bd: 330 }, { #c1127ea9: 77 })>, - <#295746e6: ({ #d121c0bd: 88 }, { #c1127ea9: 327 })>, + <#295746e6: ({ #d121c0bd: 331 }, { #c1127ea9: 77 })>, + <#295746e6: ({ #d121c0bd: 88 }, { #c1127ea9: 328 })>, <#26796f6a: - ({ #d121c0bd: 331 }, + ({ #d121c0bd: 332 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 330 } ] })>, + { #08ec7593: [ { #c1127ea9: 331 } ] })>, <#26796f6a: ({ #d121c0bd: 86 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 88 } ] })>, - <#d3d219f7: ({ #d121c0bd: 332 }, { #c1127ea9: 77 })>, - <#d3d219f7: ({ #d121c0bd: 333 }, { #c1127ea9: 96 })>, - <#0b08cd60: ({ #d121c0bd: 334 }, { #c1127ea9: 77 })>, - <#ece2635f: ({ #d121c0bd: 335 })>, + <#d3d219f7: ({ #d121c0bd: 333 }, { #c1127ea9: 77 })>, + <#d3d219f7: ({ #d121c0bd: 334 }, { #c1127ea9: 96 })>, + <#0b08cd60: ({ #d121c0bd: 335 }, { #c1127ea9: 77 })>, <#ece2635f: ({ #d121c0bd: 336 })>, - <#d49f978d: ({ #d121c0bd: 337 })>, + <#ece2635f: ({ #d121c0bd: 337 })>, + <#d49f978d: ({ #d121c0bd: 338 })>, <#da0c5ecf: ({ #d121c0bd: 113 }, { #cd26765d: { #c1127ea9: 10 }, #11302019: 4 }, 42)>, <#d80cb60b: ({ #d121c0bd: 115 }, 114)>, <#263b5f37: ({ #d121c0bd: 142, #26f32be5: 115 })>, - <#0b08cd60: ({ #d121c0bd: 338 }, { #c1127ea9: 115, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 339 }, { #c1127ea9: 115, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 122 }, { #c1127ea9: 142, #ea1a680e: true })>, - <#ece2635f: ({ #d121c0bd: 339 })>, <#ece2635f: ({ #d121c0bd: 340 })>, - <#d49f978d: ({ #d121c0bd: 341 })>, + <#ece2635f: ({ #d121c0bd: 341 })>, + <#d49f978d: ({ #d121c0bd: 342 })>, <#26796f6a: - ({ #d121c0bd: 342 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, + ({ #d121c0bd: 343 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, <#26796f6a: - ({ #d121c0bd: 343 }, + ({ #d121c0bd: 344 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 338 } ] })>, + { #08ec7593: [ { #c1127ea9: 339 } ] })>, <#26796f6a: ({ #d121c0bd: 120 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 122 } ] })>, - <#295746e6: ({ #d121c0bd: 344 }, { #c1127ea9: 115 })>, + <#295746e6: ({ #d121c0bd: 345 }, { #c1127ea9: 115 })>, <#295746e6: ({ #d121c0bd: 126 }, { #c1127ea9: 142 })>, <#26796f6a: - ({ #d121c0bd: 345 }, + ({ #d121c0bd: 346 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 344 } ] })>, + { #08ec7593: [ { #c1127ea9: 345 } ] })>, <#26796f6a: ({ #d121c0bd: 124 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 126 } ] })>, - <#d3d219f7: ({ #d121c0bd: 346 }, { #c1127ea9: 115 })>, - <#d3d219f7: ({ #d121c0bd: 347 }, { #c1127ea9: 142 })>, - <#0b08cd60: ({ #d121c0bd: 348 }, { #c1127ea9: 115 })>, + <#d3d219f7: ({ #d121c0bd: 347 }, { #c1127ea9: 115 })>, + <#d3d219f7: ({ #d121c0bd: 348 }, { #c1127ea9: 142 })>, + <#0b08cd60: ({ #d121c0bd: 349 }, { #c1127ea9: 115 })>, <#da0c5ecf: ({ #d121c0bd: 159 }, { #cd26765d: { #c1127ea9: 10 }, #11302019: 4 }, 5)>, - <#0c1e4fc4: ({ #d121c0bd: 349, #26f32be5: 159 }, { #c1127ea9: 159 })>, - <#0b08cd60: ({ #d121c0bd: 350 }, { #c1127ea9: 159 })>, - <#0b08cd60: ({ #d121c0bd: 351 }, { #c1127ea9: 349 })>, - <#ece2635f: ({ #d121c0bd: 352 })>, + <#0c1e4fc4: ({ #d121c0bd: 350, #26f32be5: 159 }, { #c1127ea9: 159 })>, + <#0b08cd60: ({ #d121c0bd: 351 }, { #c1127ea9: 159 })>, + <#0b08cd60: ({ #d121c0bd: 352 }, { #c1127ea9: 350 })>, <#ece2635f: ({ #d121c0bd: 353 })>, - <#d49f978d: ({ #d121c0bd: 354 })>, + <#ece2635f: ({ #d121c0bd: 354 })>, + <#d49f978d: ({ #d121c0bd: 355 })>, <#26796f6a: ({ #d121c0bd: 161 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 10 } ] })>, - <#0c1e4fc4: ({ #d121c0bd: 355, #26f32be5: 161 }, { #c1127ea9: 161 })>, - <#d3d219f7: ({ #d121c0bd: 356 }, { #c1127ea9: 161 })>, - <#d3d219f7: ({ #d121c0bd: 357 }, { #c1127ea9: 355 })>, - <#ece2635f: ({ #d121c0bd: 358 })>, + <#0c1e4fc4: ({ #d121c0bd: 356, #26f32be5: 161 }, { #c1127ea9: 161 })>, + <#d3d219f7: ({ #d121c0bd: 357 }, { #c1127ea9: 161 })>, + <#d3d219f7: ({ #d121c0bd: 358 }, { #c1127ea9: 356 })>, <#ece2635f: ({ #d121c0bd: 359 })>, - <#d49f978d: ({ #d121c0bd: 360 })>, - <#d3d219f7: ({ #d121c0bd: 361 }, { #c1127ea9: 10 })>, + <#ece2635f: ({ #d121c0bd: 360 })>, + <#d49f978d: ({ #d121c0bd: 361 })>, + <#d3d219f7: ({ #d121c0bd: 362 }, { #c1127ea9: 10 })>, <#d80cb60b: ({ #d121c0bd: 100 }, 99)>, - <#ece2635f: ({ #d121c0bd: 362, #26f32be5: 100 })>, + <#ece2635f: ({ #d121c0bd: 363, #26f32be5: 100 })>, <#263b5f37: ({ #d121c0bd: 178, #26f32be5: 100 })>, <#26796f6a: - ({ #d121c0bd: 363 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, - <#263b5f37: ({ #d121c0bd: 364, #26f32be5: 100 })>, - <#0b08cd60: ({ #d121c0bd: 365 }, { #c1127ea9: 100, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 107 }, { #c1127ea9: 364, #ea1a680e: true })>, + ({ #d121c0bd: 364 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, + <#263b5f37: ({ #d121c0bd: 365, #26f32be5: 100 })>, + <#0b08cd60: ({ #d121c0bd: 366 }, { #c1127ea9: 100, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 107 }, { #c1127ea9: 365, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 366 }, + ({ #d121c0bd: 367 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 365 } ] })>, + { #08ec7593: [ { #c1127ea9: 366 } ] })>, <#26796f6a: ({ #d121c0bd: 105 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 107 } ] })>, - <#295746e6: ({ #d121c0bd: 367 }, { #c1127ea9: 100 })>, - <#295746e6: ({ #d121c0bd: 111 }, { #c1127ea9: 364 })>, + <#295746e6: ({ #d121c0bd: 368 }, { #c1127ea9: 100 })>, + <#295746e6: ({ #d121c0bd: 111 }, { #c1127ea9: 365 })>, <#26796f6a: - ({ #d121c0bd: 368 }, + ({ #d121c0bd: 369 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 367 } ] })>, + { #08ec7593: [ { #c1127ea9: 368 } ] })>, <#26796f6a: ({ #d121c0bd: 109 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 111 } ] })>, - <#d3d219f7: ({ #d121c0bd: 369 }, { #c1127ea9: 100 })>, - <#d3d219f7: ({ #d121c0bd: 370 }, { #c1127ea9: 178 })>, - <#0b08cd60: ({ #d121c0bd: 371 }, { #c1127ea9: 100 })>, + <#d3d219f7: ({ #d121c0bd: 370 }, { #c1127ea9: 100 })>, + <#d3d219f7: ({ #d121c0bd: 371 }, { #c1127ea9: 178 })>, + <#0b08cd60: ({ #d121c0bd: 372 }, { #c1127ea9: 100 })>, <#d80cb60b: ({ #d121c0bd: 129 }, 128)>, - <#ece2635f: ({ #d121c0bd: 372, #26f32be5: 129 })>, + <#ece2635f: ({ #d121c0bd: 373, #26f32be5: 129 })>, <#263b5f37: ({ #d121c0bd: 181, #26f32be5: 129 })>, <#26796f6a: - ({ #d121c0bd: 373 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, - <#263b5f37: ({ #d121c0bd: 374, #26f32be5: 129 })>, - <#0b08cd60: ({ #d121c0bd: 375 }, { #c1127ea9: 129, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 136 }, { #c1127ea9: 374, #ea1a680e: true })>, + ({ #d121c0bd: 374 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, + <#263b5f37: ({ #d121c0bd: 375, #26f32be5: 129 })>, + <#0b08cd60: ({ #d121c0bd: 376 }, { #c1127ea9: 129, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 136 }, { #c1127ea9: 375, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 376 }, + ({ #d121c0bd: 377 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 375 } ] })>, + { #08ec7593: [ { #c1127ea9: 376 } ] })>, <#26796f6a: ({ #d121c0bd: 134 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 136 } ] })>, - <#295746e6: ({ #d121c0bd: 377 }, { #c1127ea9: 129 })>, - <#295746e6: ({ #d121c0bd: 140 }, { #c1127ea9: 374 })>, + <#295746e6: ({ #d121c0bd: 378 }, { #c1127ea9: 129 })>, + <#295746e6: ({ #d121c0bd: 140 }, { #c1127ea9: 375 })>, <#26796f6a: - ({ #d121c0bd: 378 }, + ({ #d121c0bd: 379 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 377 } ] })>, + { #08ec7593: [ { #c1127ea9: 378 } ] })>, <#26796f6a: ({ #d121c0bd: 138 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 140 } ] })>, - <#d3d219f7: ({ #d121c0bd: 379 }, { #c1127ea9: 129 })>, - <#d3d219f7: ({ #d121c0bd: 380 }, { #c1127ea9: 181 })>, - <#0b08cd60: ({ #d121c0bd: 381 }, { #c1127ea9: 129 })>, + <#d3d219f7: ({ #d121c0bd: 380 }, { #c1127ea9: 129 })>, + <#d3d219f7: ({ #d121c0bd: 381 }, { #c1127ea9: 181 })>, + <#0b08cd60: ({ #d121c0bd: 382 }, { #c1127ea9: 129 })>, <#d80cb60b: ({ #d121c0bd: 146 }, 145)>, - <#ece2635f: ({ #d121c0bd: 382, #26f32be5: 146 })>, + <#ece2635f: ({ #d121c0bd: 383, #26f32be5: 146 })>, <#263b5f37: ({ #d121c0bd: 184, #26f32be5: 146 })>, <#26796f6a: - ({ #d121c0bd: 383 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, - <#263b5f37: ({ #d121c0bd: 384, #26f32be5: 146 })>, - <#0b08cd60: ({ #d121c0bd: 385 }, { #c1127ea9: 146, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 153 }, { #c1127ea9: 384, #ea1a680e: true })>, + ({ #d121c0bd: 384 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, + <#263b5f37: ({ #d121c0bd: 385, #26f32be5: 146 })>, + <#0b08cd60: ({ #d121c0bd: 386 }, { #c1127ea9: 146, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 153 }, { #c1127ea9: 385, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 386 }, + ({ #d121c0bd: 387 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 385 } ] })>, + { #08ec7593: [ { #c1127ea9: 386 } ] })>, <#26796f6a: ({ #d121c0bd: 151 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 153 } ] })>, - <#295746e6: ({ #d121c0bd: 387 }, { #c1127ea9: 146 })>, - <#295746e6: ({ #d121c0bd: 157 }, { #c1127ea9: 384 })>, + <#295746e6: ({ #d121c0bd: 388 }, { #c1127ea9: 146 })>, + <#295746e6: ({ #d121c0bd: 157 }, { #c1127ea9: 385 })>, <#26796f6a: - ({ #d121c0bd: 388 }, + ({ #d121c0bd: 389 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 387 } ] })>, + { #08ec7593: [ { #c1127ea9: 388 } ] })>, <#26796f6a: ({ #d121c0bd: 155 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 157 } ] })>, - <#d3d219f7: ({ #d121c0bd: 389 }, { #c1127ea9: 146 })>, - <#d3d219f7: ({ #d121c0bd: 390 }, { #c1127ea9: 184 })>, - <#0b08cd60: ({ #d121c0bd: 391 }, { #c1127ea9: 146 })>, - <#0b08cd60: ({ #d121c0bd: 392 }, { #c1127ea9: 161 })>, + <#d3d219f7: ({ #d121c0bd: 390 }, { #c1127ea9: 146 })>, + <#d3d219f7: ({ #d121c0bd: 391 }, { #c1127ea9: 184 })>, + <#0b08cd60: ({ #d121c0bd: 392 }, { #c1127ea9: 146 })>, + <#0b08cd60: ({ #d121c0bd: 393 }, { #c1127ea9: 161 })>, <#d80cb60b: ({ #d121c0bd: 165 }, 164)>, - <#ece2635f: ({ #d121c0bd: 393, #26f32be5: 165 })>, + <#ece2635f: ({ #d121c0bd: 394, #26f32be5: 165 })>, <#263b5f37: ({ #d121c0bd: 187, #26f32be5: 165 })>, <#26796f6a: - ({ #d121c0bd: 394 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, - <#263b5f37: ({ #d121c0bd: 395, #26f32be5: 165 })>, - <#0b08cd60: ({ #d121c0bd: 396 }, { #c1127ea9: 165, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 172 }, { #c1127ea9: 395, #ea1a680e: true })>, + ({ #d121c0bd: 395 }, { #f9c96be9: { #c1127ea9: 191 } }, { })>, + <#263b5f37: ({ #d121c0bd: 396, #26f32be5: 165 })>, + <#0b08cd60: ({ #d121c0bd: 397 }, { #c1127ea9: 165, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 172 }, { #c1127ea9: 396, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 397 }, + ({ #d121c0bd: 398 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 396 } ] })>, + { #08ec7593: [ { #c1127ea9: 397 } ] })>, <#26796f6a: ({ #d121c0bd: 170 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 172 } ] })>, - <#295746e6: ({ #d121c0bd: 398 }, { #c1127ea9: 165 })>, - <#295746e6: ({ #d121c0bd: 176 }, { #c1127ea9: 395 })>, + <#295746e6: ({ #d121c0bd: 399 }, { #c1127ea9: 165 })>, + <#295746e6: ({ #d121c0bd: 176 }, { #c1127ea9: 396 })>, <#26796f6a: - ({ #d121c0bd: 399 }, + ({ #d121c0bd: 400 }, { #f9c96be9: { #c1127ea9: 191 } }, - { #08ec7593: [ { #c1127ea9: 398 } ] })>, + { #08ec7593: [ { #c1127ea9: 399 } ] })>, <#26796f6a: ({ #d121c0bd: 174 }, { #f9c96be9: { #c1127ea9: 191 } }, { #08ec7593: [ { #c1127ea9: 176 } ] })>, - <#d3d219f7: ({ #d121c0bd: 400 }, { #c1127ea9: 165 })>, - <#d3d219f7: ({ #d121c0bd: 401 }, { #c1127ea9: 187 })>, - <#0b08cd60: ({ #d121c0bd: 402 }, { #c1127ea9: 165 })>, - <#0098a8c5: ({ #d121c0bd: 403 }, { #fcd148e8: 246 })>, - <#2e3d736c: ({ #d121c0bd: 404 }, { #c1127ea9: 403 })>, + <#d3d219f7: ({ #d121c0bd: 401 }, { #c1127ea9: 165 })>, + <#d3d219f7: ({ #d121c0bd: 402 }, { #c1127ea9: 187 })>, + <#0b08cd60: ({ #d121c0bd: 403 }, { #c1127ea9: 165 })>, + <#0098a8c5: ({ #d121c0bd: 404 }, { #fcd148e8: 247 })>, + <#2e3d736c: ({ #d121c0bd: 405 }, { #c1127ea9: 404 })>, <#19e1ef85: - ({ #d121c0bd: 405, #26f32be5: 404 }, - { #0b680f7d: { #c1127ea9: 404 }, #c3687459: 406 })>, + ({ #d121c0bd: 406, #26f32be5: 405 }, + { #0b680f7d: { #c1127ea9: 405 }, #c3687459: 407 })>, <#19e1ef85: - ({ #d121c0bd: 190, #26f32be5: 404 }, - { #0b680f7d: { #c1127ea9: 405 }, #c3687459: 189 })>, - <#2d935553: ({ #d121c0bd: 407, #26f32be5: 361 }, { #c1127ea9: 361 })>, - <#2d935553: ({ #d121c0bd: 408, #26f32be5: 361 }, { #c1127ea9: 361 })>, + ({ #d121c0bd: 190, #26f32be5: 405 }, + { #0b680f7d: { #c1127ea9: 406 }, #c3687459: 189 })>, + <#2d935553: ({ #d121c0bd: 408, #26f32be5: 362 }, { #c1127ea9: 362 })>, + <#2d935553: ({ #d121c0bd: 409, #26f32be5: 362 }, { #c1127ea9: 362 })>, <#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 d4a6e3a07fe..3335436792b 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/this.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/this.cpp.exp @@ -235,38 +235,39 @@ <#22d546dd: ({ #d121c0bd: 70 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 71 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 72 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 73 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 74 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 75 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 76 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 77 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 78 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 79 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 80 }, { #c1127ea9: 22 })>, - <#22d546dd: ({ #d121c0bd: 81 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 82 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 83 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 84 }, 85)>, - <#d3d219f7: ({ #d121c0bd: 86 }, { #c1127ea9: 11, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 87 }, { #c1127ea9: 24, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 24 })>, - <#d80cb60b: ({ #d121c0bd: 89 }, 90)>, + <#22d546dd: ({ #d121c0bd: 73 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 74 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 75 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 76 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 77 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 78 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 79 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 80 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 81 }, { #c1127ea9: 22 })>, + <#22d546dd: ({ #d121c0bd: 82 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 83 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 84 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 85 }, 86)>, + <#d3d219f7: ({ #d121c0bd: 87 }, { #c1127ea9: 11, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 24, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 24 })>, + <#d80cb60b: ({ #d121c0bd: 90 }, 91)>, <#da0c5ecf: - ({ #d121c0bd: 91 }, - { #cd26765d: { #c1127ea9: 89 }, #11302019: 24 }, + ({ #d121c0bd: 92 }, + { #cd26765d: { #c1127ea9: 90 }, #11302019: 24 }, 1)>, <#d80cb60b: ({ #d121c0bd: 8 }, 7)>, <#d3d219f7: ({ #d121c0bd: 18 }, { #c1127ea9: 8 })>, <#26796f6a: ({ #d121c0bd: 13 }, { #f9c96be9: { #c1127ea9: 22 } }, { })>, - <#0098a8c5: ({ #d121c0bd: 92 }, { #fcd148e8: 77 })>, - <#2e3d736c: ({ #d121c0bd: 93 }, { #c1127ea9: 92 })>, + <#0098a8c5: ({ #d121c0bd: 93 }, { #fcd148e8: 78 })>, + <#2e3d736c: ({ #d121c0bd: 94 }, { #c1127ea9: 93 })>, <#19e1ef85: - ({ #d121c0bd: 94, #26f32be5: 93 }, - { #0b680f7d: { #c1127ea9: 93 }, #c3687459: 95 })>, + ({ #d121c0bd: 95, #26f32be5: 94 }, + { #0b680f7d: { #c1127ea9: 94 }, #c3687459: 96 })>, <#19e1ef85: - ({ #d121c0bd: 21, #26f32be5: 93 }, - { #0b680f7d: { #c1127ea9: 94 }, #c3687459: 20 })>, + ({ #d121c0bd: 21, #26f32be5: 94 }, + { #0b680f7d: { #c1127ea9: 95 }, #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 7afda9317fb..4cdc08b2c61 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/type_trait.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/type_trait.cpp.exp @@ -458,70 +458,71 @@ <#22d546dd: ({ #d121c0bd: 93 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 94 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 95 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 96 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 97 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 98 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 99 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 100 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 101 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 102 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 103 }, { #c1127ea9: 46 })>, - <#22d546dd: ({ #d121c0bd: 104 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 105 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 106 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 107 }, 108)>, - <#d3d219f7: ({ #d121c0bd: 109 }, { #c1127ea9: 30, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 110 }, { #c1127ea9: 47, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 111 }, { #c1127ea9: 47 })>, - <#d80cb60b: ({ #d121c0bd: 112 }, 113)>, + <#22d546dd: ({ #d121c0bd: 96 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 97 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 98 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 99 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 100 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 101 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 102 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 103 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 104 }, { #c1127ea9: 46 })>, + <#22d546dd: ({ #d121c0bd: 105 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 106 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 107 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 108 }, 109)>, + <#d3d219f7: ({ #d121c0bd: 110 }, { #c1127ea9: 30, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 111 }, { #c1127ea9: 47, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 112 }, { #c1127ea9: 47 })>, + <#d80cb60b: ({ #d121c0bd: 113 }, 114)>, <#da0c5ecf: - ({ #d121c0bd: 114 }, - { #cd26765d: { #c1127ea9: 112 }, #11302019: 24 }, + ({ #d121c0bd: 115 }, + { #cd26765d: { #c1127ea9: 113 }, #11302019: 24 }, 1)>, <#d80cb60b: ({ #d121c0bd: 8 }, 7)>, - <#d3d219f7: ({ #d121c0bd: 115 }, { #c1127ea9: 8 })>, + <#d3d219f7: ({ #d121c0bd: 116 }, { #c1127ea9: 8 })>, <#26796f6a: ({ #d121c0bd: 11 }, { #f9c96be9: { #c1127ea9: 46 } }, { })>, - <#263b5f37: ({ #d121c0bd: 116, #26f32be5: 8 })>, - <#0b08cd60: ({ #d121c0bd: 117 }, { #c1127ea9: 8 })>, - <#0b08cd60: ({ #d121c0bd: 118 }, { #c1127ea9: 116 })>, - <#0b08cd60: ({ #d121c0bd: 119 }, { #c1127ea9: 8, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 16 }, { #c1127ea9: 116, #ea1a680e: true })>, + <#263b5f37: ({ #d121c0bd: 117, #26f32be5: 8 })>, + <#0b08cd60: ({ #d121c0bd: 118 }, { #c1127ea9: 8 })>, + <#0b08cd60: ({ #d121c0bd: 119 }, { #c1127ea9: 117 })>, + <#0b08cd60: ({ #d121c0bd: 120 }, { #c1127ea9: 8, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 16 }, { #c1127ea9: 117, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 120 }, - { #f9c96be9: { #c1127ea9: 117 } }, - { #08ec7593: [ { #c1127ea9: 119 } ] })>, + ({ #d121c0bd: 121 }, + { #f9c96be9: { #c1127ea9: 118 } }, + { #08ec7593: [ { #c1127ea9: 120 } ] })>, <#26796f6a: ({ #d121c0bd: 14 }, - { #f9c96be9: { #c1127ea9: 118 } }, + { #f9c96be9: { #c1127ea9: 119 } }, { #08ec7593: [ { #c1127ea9: 16 } ] })>, - <#295746e6: ({ #d121c0bd: 121 }, { #c1127ea9: 8 })>, - <#295746e6: ({ #d121c0bd: 20 }, { #c1127ea9: 116 })>, + <#295746e6: ({ #d121c0bd: 122 }, { #c1127ea9: 8 })>, + <#295746e6: ({ #d121c0bd: 20 }, { #c1127ea9: 117 })>, <#26796f6a: - ({ #d121c0bd: 122 }, - { #f9c96be9: { #c1127ea9: 117 } }, - { #08ec7593: [ { #c1127ea9: 121 } ] })>, + ({ #d121c0bd: 123 }, + { #f9c96be9: { #c1127ea9: 118 } }, + { #08ec7593: [ { #c1127ea9: 122 } ] })>, <#26796f6a: ({ #d121c0bd: 18 }, - { #f9c96be9: { #c1127ea9: 118 } }, + { #f9c96be9: { #c1127ea9: 119 } }, { #08ec7593: [ { #c1127ea9: 20 } ] })>, <#26796f6a: ({ #d121c0bd: 22 }, { #f9c96be9: { #c1127ea9: 46 } }, { })>, - <#f3f3711a: ({ #d121c0bd: 123 })>, <#f3f3711a: ({ #d121c0bd: 124 })>, + <#f3f3711a: ({ #d121c0bd: 125 })>, <#26796f6a: ({ #d121c0bd: 25 }, { #f9c96be9: { #c1127ea9: 29 } }, { })>, <#d3d219f7: ({ #d121c0bd: 39 }, { #c1127ea9: 25 })>, - <#dd64b59b: ({ #d121c0bd: 125, #26f32be5: 30 })>, - <#dd64b59b: ({ #d121c0bd: 126, #26f32be5: 8 })>, - <#0098a8c5: ({ #d121c0bd: 127 }, { #fcd148e8: 100 })>, - <#2e3d736c: ({ #d121c0bd: 128 }, { #c1127ea9: 127 })>, + <#dd64b59b: ({ #d121c0bd: 126, #26f32be5: 30 })>, + <#dd64b59b: ({ #d121c0bd: 127, #26f32be5: 8 })>, + <#0098a8c5: ({ #d121c0bd: 128 }, { #fcd148e8: 101 })>, + <#2e3d736c: ({ #d121c0bd: 129 }, { #c1127ea9: 128 })>, <#19e1ef85: - ({ #d121c0bd: 129, #26f32be5: 128 }, - { #0b680f7d: { #c1127ea9: 128 }, #c3687459: 130 })>, + ({ #d121c0bd: 130, #26f32be5: 129 }, + { #0b680f7d: { #c1127ea9: 129 }, #c3687459: 131 })>, <#19e1ef85: - ({ #d121c0bd: 45, #26f32be5: 128 }, - { #0b680f7d: { #c1127ea9: 129 }, #c3687459: 44 })>, + ({ #d121c0bd: 45, #26f32be5: 129 }, + { #0b680f7d: { #c1127ea9: 130 }, #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 028d60c6d7e..4aaa2483d19 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/unresolved_lookup.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/unresolved_lookup.cpp.exp @@ -118,53 +118,54 @@ <#22d546dd: ({ #d121c0bd: 59 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 60 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 61 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 62 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 63 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 64 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 65 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 66 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 67 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 68 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 69 }, { #c1127ea9: 10 })>, - <#22d546dd: ({ #d121c0bd: 70 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 71 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 72 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 73 }, 74)>, - <#d3d219f7: ({ #d121c0bd: 75 }, { #c1127ea9: 15, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 76 }, { #c1127ea9: 12, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 12 })>, - <#d80cb60b: ({ #d121c0bd: 78 }, 79)>, + <#22d546dd: ({ #d121c0bd: 62 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 63 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 64 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 65 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 66 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 67 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 68 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 69 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 70 }, { #c1127ea9: 10 })>, + <#22d546dd: ({ #d121c0bd: 71 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 72 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 73 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 74 }, 75)>, + <#d3d219f7: ({ #d121c0bd: 76 }, { #c1127ea9: 15, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 12, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 78 }, { #c1127ea9: 12 })>, + <#d80cb60b: ({ #d121c0bd: 79 }, 80)>, <#da0c5ecf: - ({ #d121c0bd: 80 }, - { #cd26765d: { #c1127ea9: 78 }, #11302019: 24 }, + ({ #d121c0bd: 81 }, + { #cd26765d: { #c1127ea9: 79 }, #11302019: 24 }, 1)>, - <#f3f3711a: ({ #d121c0bd: 81 })>, <#f3f3711a: ({ #d121c0bd: 82 })>, - <#ece2635f: ({ #d121c0bd: 83 })>, + <#f3f3711a: ({ #d121c0bd: 83 })>, <#ece2635f: ({ #d121c0bd: 84 })>, - <#d49f978d: ({ #d121c0bd: 85 })>, - <#f3f3711a: ({ #d121c0bd: 86 })>, + <#ece2635f: ({ #d121c0bd: 85 })>, + <#d49f978d: ({ #d121c0bd: 86 })>, <#f3f3711a: ({ #d121c0bd: 87 })>, - <#d3d219f7: ({ #d121c0bd: 88 }, { #c1127ea9: 86 })>, + <#f3f3711a: ({ #d121c0bd: 88 })>, <#d3d219f7: ({ #d121c0bd: 89 }, { #c1127ea9: 87 })>, - <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 85 })>, - <#26796f6a: - ({ #d121c0bd: 91 }, - { #f9c96be9: { #c1127ea9: 15 } }, - { #08ec7593: [ { #c1127ea9: 88 } ] })>, + <#d3d219f7: ({ #d121c0bd: 90 }, { #c1127ea9: 88 })>, + <#d3d219f7: ({ #d121c0bd: 91 }, { #c1127ea9: 86 })>, <#26796f6a: ({ #d121c0bd: 92 }, { #f9c96be9: { #c1127ea9: 15 } }, { #08ec7593: [ { #c1127ea9: 89 } ] })>, - <#ece2635f: ({ #d121c0bd: 93, #26f32be5: 85 })>, - <#0098a8c5: ({ #d121c0bd: 94 }, { #fcd148e8: 66 })>, - <#2e3d736c: ({ #d121c0bd: 95 }, { #c1127ea9: 94 })>, + <#26796f6a: + ({ #d121c0bd: 93 }, + { #f9c96be9: { #c1127ea9: 15 } }, + { #08ec7593: [ { #c1127ea9: 90 } ] })>, + <#ece2635f: ({ #d121c0bd: 94, #26f32be5: 86 })>, + <#0098a8c5: ({ #d121c0bd: 95 }, { #fcd148e8: 67 })>, + <#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: 9, #26f32be5: 95 }, - { #0b680f7d: { #c1127ea9: 96 }, #c3687459: 8 })>, + ({ #d121c0bd: 9, #26f32be5: 96 }, + { #0b680f7d: { #c1127ea9: 97 }, #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 824ef70224f..1a0ffbb7268 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/using_directive.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/using_directive.cpp.exp @@ -233,34 +233,35 @@ <#22d546dd: ({ #d121c0bd: 66 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 67 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 68 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 69 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 70 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 71 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 72 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 73 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 74 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 75 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 76 }, { #c1127ea9: 18 })>, - <#22d546dd: ({ #d121c0bd: 77 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 78 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 79 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 80 }, 81)>, - <#d3d219f7: ({ #d121c0bd: 82 }, { #c1127ea9: 10, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 20, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 84 }, { #c1127ea9: 20 })>, - <#d80cb60b: ({ #d121c0bd: 85 }, 86)>, + <#22d546dd: ({ #d121c0bd: 69 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 70 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 71 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 72 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 73 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 74 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 75 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 76 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 77 }, { #c1127ea9: 18 })>, + <#22d546dd: ({ #d121c0bd: 78 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 79 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 80 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 81 }, 82)>, + <#d3d219f7: ({ #d121c0bd: 83 }, { #c1127ea9: 10, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 84 }, { #c1127ea9: 20, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 85 }, { #c1127ea9: 20 })>, + <#d80cb60b: ({ #d121c0bd: 86 }, 87)>, <#da0c5ecf: - ({ #d121c0bd: 87 }, - { #cd26765d: { #c1127ea9: 85 }, #11302019: 24 }, + ({ #d121c0bd: 88 }, + { #cd26765d: { #c1127ea9: 86 }, #11302019: 24 }, 1)>, - <#0098a8c5: ({ #d121c0bd: 88 }, { #fcd148e8: 73 })>, - <#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: 17, #26f32be5: 89 }, - { #0b680f7d: { #c1127ea9: 90 }, #c3687459: 16 })>, + ({ #d121c0bd: 17, #26f32be5: 90 }, + { #0b680f7d: { #c1127ea9: 91 }, #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 4aabcae1279..de169f8ae46 100644 --- a/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/virtual_bases.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/BiniouASTExporter/virtual_bases.cpp.exp @@ -783,141 +783,142 @@ <#22d546dd: ({ #d121c0bd: 123 }, <#c4f079df>)>, <#22d546dd: ({ #d121c0bd: 124 }, <#1ee7219a>)>, <#22d546dd: ({ #d121c0bd: 125 }, <#0d506118>)>, - <#22d546dd: ({ #d121c0bd: 126 }, <#dec9bcfd>)>, - <#22d546dd: ({ #d121c0bd: 127 }, <#f1f6e5a2>)>, - <#22d546dd: ({ #d121c0bd: 128 }, <#d935d0cf>)>, - <#22d546dd: ({ #d121c0bd: 129 }, <#d35a4eab>)>, - <#22d546dd: ({ #d121c0bd: 130 }, <#c9ba0f87>)>, - <#22d546dd: ({ #d121c0bd: 131 }, <#db21580c>)>, - <#22d546dd: ({ #d121c0bd: 132 }, <#391b1e6e>)>, - <#d3d219f7: ({ #d121c0bd: 133 }, { #c1127ea9: 74 })>, - <#22d546dd: ({ #d121c0bd: 134 }, <#ea323187>)>, - <#22d546dd: ({ #d121c0bd: 135 }, <#2fe155d3>)>, - <#22d546dd: ({ #d121c0bd: 136 }, <#f65b235f>)>, - <#d80cb60b: ({ #d121c0bd: 137 }, 138)>, - <#d3d219f7: ({ #d121c0bd: 139 }, { #c1127ea9: 79, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 140 }, { #c1127ea9: 76, #ea1a680e: true })>, - <#d3d219f7: ({ #d121c0bd: 141 }, { #c1127ea9: 76 })>, - <#d80cb60b: ({ #d121c0bd: 142 }, 143)>, + <#22d546dd: ({ #d121c0bd: 126 }, <#f9ed64cb>)>, + <#22d546dd: ({ #d121c0bd: 127 }, <#dec9bcfd>)>, + <#22d546dd: ({ #d121c0bd: 128 }, <#f1f6e5a2>)>, + <#22d546dd: ({ #d121c0bd: 129 }, <#d935d0cf>)>, + <#22d546dd: ({ #d121c0bd: 130 }, <#d35a4eab>)>, + <#22d546dd: ({ #d121c0bd: 131 }, <#c9ba0f87>)>, + <#22d546dd: ({ #d121c0bd: 132 }, <#db21580c>)>, + <#22d546dd: ({ #d121c0bd: 133 }, <#391b1e6e>)>, + <#d3d219f7: ({ #d121c0bd: 134 }, { #c1127ea9: 74 })>, + <#22d546dd: ({ #d121c0bd: 135 }, <#ea323187>)>, + <#22d546dd: ({ #d121c0bd: 136 }, <#2fe155d3>)>, + <#22d546dd: ({ #d121c0bd: 137 }, <#f65b235f>)>, + <#d80cb60b: ({ #d121c0bd: 138 }, 139)>, + <#d3d219f7: ({ #d121c0bd: 140 }, { #c1127ea9: 79, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 141 }, { #c1127ea9: 76, #ea1a680e: true })>, + <#d3d219f7: ({ #d121c0bd: 142 }, { #c1127ea9: 76 })>, + <#d80cb60b: ({ #d121c0bd: 143 }, 144)>, <#da0c5ecf: - ({ #d121c0bd: 144 }, - { #cd26765d: { #c1127ea9: 142 }, #11302019: 24 }, + ({ #d121c0bd: 145 }, + { #cd26765d: { #c1127ea9: 143 }, #11302019: 24 }, 1)>, <#d80cb60b: ({ #d121c0bd: 8 }, 7)>, - <#d3d219f7: ({ #d121c0bd: 145 }, { #c1127ea9: 8 })>, + <#d3d219f7: ({ #d121c0bd: 146 }, { #c1127ea9: 8 })>, <#26796f6a: ({ #d121c0bd: 11 }, { #f9c96be9: { #c1127ea9: 74 } }, { })>, <#263b5f37: ({ #d121c0bd: 28, #26f32be5: 8 })>, <#26796f6a: - ({ #d121c0bd: 146 }, { #f9c96be9: { #c1127ea9: 74 } }, { })>, + ({ #d121c0bd: 147 }, { #f9c96be9: { #c1127ea9: 74 } }, { })>, <#26796f6a: ({ #d121c0bd: 14 }, { #f9c96be9: { #c1127ea9: 74 } }, { })>, <#d80cb60b: ({ #d121c0bd: 24 }, 23)>, - <#d3d219f7: ({ #d121c0bd: 147 }, { #c1127ea9: 24 })>, + <#d3d219f7: ({ #d121c0bd: 148 }, { #c1127ea9: 24 })>, <#263b5f37: ({ #d121c0bd: 61, #26f32be5: 24 })>, <#26796f6a: - ({ #d121c0bd: 148 }, { #f9c96be9: { #c1127ea9: 74 } }, { })>, - <#0b08cd60: ({ #d121c0bd: 149 }, { #c1127ea9: 24, #ea1a680e: true })>, + ({ #d121c0bd: 149 }, { #f9c96be9: { #c1127ea9: 74 } }, { })>, + <#0b08cd60: ({ #d121c0bd: 150 }, { #c1127ea9: 24, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 35 }, { #c1127ea9: 61, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 150 }, + ({ #d121c0bd: 151 }, { #f9c96be9: { #c1127ea9: 74 } }, - { #08ec7593: [ { #c1127ea9: 149 } ] })>, + { #08ec7593: [ { #c1127ea9: 150 } ] })>, <#26796f6a: ({ #d121c0bd: 33 }, { #f9c96be9: { #c1127ea9: 74 } }, { #08ec7593: [ { #c1127ea9: 35 } ] })>, - <#0b08cd60: ({ #d121c0bd: 151 }, { #c1127ea9: 8, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 152 }, { #c1127ea9: 8, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 19 }, { #c1127ea9: 28, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 152 }, + ({ #d121c0bd: 153 }, { #f9c96be9: { #c1127ea9: 74 } }, - { #08ec7593: [ { #c1127ea9: 151 } ] })>, + { #08ec7593: [ { #c1127ea9: 152 } ] })>, <#26796f6a: ({ #d121c0bd: 17 }, { #f9c96be9: { #c1127ea9: 74 } }, { #08ec7593: [ { #c1127ea9: 19 } ] })>, - <#0b08cd60: ({ #d121c0bd: 153 }, { #c1127ea9: 24 })>, - <#0b08cd60: ({ #d121c0bd: 154 }, { #c1127ea9: 61 })>, + <#0b08cd60: ({ #d121c0bd: 154 }, { #c1127ea9: 24 })>, + <#0b08cd60: ({ #d121c0bd: 155 }, { #c1127ea9: 61 })>, <#26796f6a: - ({ #d121c0bd: 155 }, - { #f9c96be9: { #c1127ea9: 153 } }, - { #08ec7593: [ { #c1127ea9: 149 } ] })>, + ({ #d121c0bd: 156 }, + { #f9c96be9: { #c1127ea9: 154 } }, + { #08ec7593: [ { #c1127ea9: 150 } ] })>, <#26796f6a: ({ #d121c0bd: 37 }, - { #f9c96be9: { #c1127ea9: 154 } }, + { #f9c96be9: { #c1127ea9: 155 } }, { #08ec7593: [ { #c1127ea9: 35 } ] })>, - <#0b08cd60: ({ #d121c0bd: 156 }, { #c1127ea9: 8 })>, - <#0b08cd60: ({ #d121c0bd: 157 }, { #c1127ea9: 28 })>, + <#0b08cd60: ({ #d121c0bd: 157 }, { #c1127ea9: 8 })>, + <#0b08cd60: ({ #d121c0bd: 158 }, { #c1127ea9: 28 })>, <#26796f6a: - ({ #d121c0bd: 158 }, - { #f9c96be9: { #c1127ea9: 156 } }, - { #08ec7593: [ { #c1127ea9: 151 } ] })>, + ({ #d121c0bd: 159 }, + { #f9c96be9: { #c1127ea9: 157 } }, + { #08ec7593: [ { #c1127ea9: 152 } ] })>, <#26796f6a: ({ #d121c0bd: 21 }, - { #f9c96be9: { #c1127ea9: 157 } }, + { #f9c96be9: { #c1127ea9: 158 } }, { #08ec7593: [ { #c1127ea9: 19 } ] })>, - <#d3d219f7: ({ #d121c0bd: 159 }, { #c1127ea9: 28 })>, + <#d3d219f7: ({ #d121c0bd: 160 }, { #c1127ea9: 28 })>, <#d80cb60b: ({ #d121c0bd: 40 }, 39)>, - <#d3d219f7: ({ #d121c0bd: 160 }, { #c1127ea9: 40 })>, + <#d3d219f7: ({ #d121c0bd: 161 }, { #c1127ea9: 40 })>, <#263b5f37: ({ #d121c0bd: 59, #26f32be5: 40 })>, <#26796f6a: - ({ #d121c0bd: 161 }, { #f9c96be9: { #c1127ea9: 74 } }, { })>, + ({ #d121c0bd: 162 }, { #f9c96be9: { #c1127ea9: 74 } }, { })>, <#d80cb60b: ({ #d121c0bd: 54 }, 53)>, - <#d3d219f7: ({ #d121c0bd: 162 }, { #c1127ea9: 54 })>, - <#263b5f37: ({ #d121c0bd: 163, #26f32be5: 54 })>, + <#d3d219f7: ({ #d121c0bd: 163 }, { #c1127ea9: 54 })>, + <#263b5f37: ({ #d121c0bd: 164, #26f32be5: 54 })>, <#26796f6a: - ({ #d121c0bd: 164 }, { #f9c96be9: { #c1127ea9: 74 } }, { })>, - <#0b08cd60: ({ #d121c0bd: 165 }, { #c1127ea9: 54, #ea1a680e: true })>, - <#0b08cd60: ({ #d121c0bd: 68 }, { #c1127ea9: 163, #ea1a680e: true })>, + ({ #d121c0bd: 165 }, { #f9c96be9: { #c1127ea9: 74 } }, { })>, + <#0b08cd60: ({ #d121c0bd: 166 }, { #c1127ea9: 54, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 68 }, { #c1127ea9: 164, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 166 }, + ({ #d121c0bd: 167 }, { #f9c96be9: { #c1127ea9: 74 } }, - { #08ec7593: [ { #c1127ea9: 165 } ] })>, + { #08ec7593: [ { #c1127ea9: 166 } ] })>, <#26796f6a: ({ #d121c0bd: 66 }, { #f9c96be9: { #c1127ea9: 74 } }, { #08ec7593: [ { #c1127ea9: 68 } ] })>, - <#0b08cd60: ({ #d121c0bd: 167 }, { #c1127ea9: 40, #ea1a680e: true })>, + <#0b08cd60: ({ #d121c0bd: 168 }, { #c1127ea9: 40, #ea1a680e: true })>, <#0b08cd60: ({ #d121c0bd: 49 }, { #c1127ea9: 59, #ea1a680e: true })>, <#26796f6a: - ({ #d121c0bd: 168 }, + ({ #d121c0bd: 169 }, { #f9c96be9: { #c1127ea9: 74 } }, - { #08ec7593: [ { #c1127ea9: 167 } ] })>, + { #08ec7593: [ { #c1127ea9: 168 } ] })>, <#26796f6a: ({ #d121c0bd: 47 }, { #f9c96be9: { #c1127ea9: 74 } }, { #08ec7593: [ { #c1127ea9: 49 } ] })>, - <#0b08cd60: ({ #d121c0bd: 169 }, { #c1127ea9: 54 })>, - <#0b08cd60: ({ #d121c0bd: 170 }, { #c1127ea9: 163 })>, + <#0b08cd60: ({ #d121c0bd: 170 }, { #c1127ea9: 54 })>, + <#0b08cd60: ({ #d121c0bd: 171 }, { #c1127ea9: 164 })>, <#26796f6a: - ({ #d121c0bd: 171 }, - { #f9c96be9: { #c1127ea9: 169 } }, - { #08ec7593: [ { #c1127ea9: 165 } ] })>, + ({ #d121c0bd: 172 }, + { #f9c96be9: { #c1127ea9: 170 } }, + { #08ec7593: [ { #c1127ea9: 166 } ] })>, <#26796f6a: ({ #d121c0bd: 70 }, - { #f9c96be9: { #c1127ea9: 170 } }, + { #f9c96be9: { #c1127ea9: 171 } }, { #08ec7593: [ { #c1127ea9: 68 } ] })>, - <#0b08cd60: ({ #d121c0bd: 172 }, { #c1127ea9: 40 })>, - <#0b08cd60: ({ #d121c0bd: 173 }, { #c1127ea9: 59 })>, + <#0b08cd60: ({ #d121c0bd: 173 }, { #c1127ea9: 40 })>, + <#0b08cd60: ({ #d121c0bd: 174 }, { #c1127ea9: 59 })>, <#26796f6a: - ({ #d121c0bd: 174 }, - { #f9c96be9: { #c1127ea9: 172 } }, - { #08ec7593: [ { #c1127ea9: 167 } ] })>, + ({ #d121c0bd: 175 }, + { #f9c96be9: { #c1127ea9: 173 } }, + { #08ec7593: [ { #c1127ea9: 168 } ] })>, <#26796f6a: ({ #d121c0bd: 51 }, - { #f9c96be9: { #c1127ea9: 173 } }, + { #f9c96be9: { #c1127ea9: 174 } }, { #08ec7593: [ { #c1127ea9: 49 } ] })>, - <#d3d219f7: ({ #d121c0bd: 175 }, { #c1127ea9: 59 })>, - <#d3d219f7: ({ #d121c0bd: 176 }, { #c1127ea9: 61 })>, - <#0098a8c5: ({ #d121c0bd: 177 }, { #fcd148e8: 130 })>, - <#2e3d736c: ({ #d121c0bd: 178 }, { #c1127ea9: 177 })>, + <#d3d219f7: ({ #d121c0bd: 176 }, { #c1127ea9: 59 })>, + <#d3d219f7: ({ #d121c0bd: 177 }, { #c1127ea9: 61 })>, + <#0098a8c5: ({ #d121c0bd: 178 }, { #fcd148e8: 131 })>, + <#2e3d736c: ({ #d121c0bd: 179 }, { #c1127ea9: 178 })>, <#19e1ef85: - ({ #d121c0bd: 179, #26f32be5: 178 }, - { #0b680f7d: { #c1127ea9: 178 }, #c3687459: 180 })>, + ({ #d121c0bd: 180, #26f32be5: 179 }, + { #0b680f7d: { #c1127ea9: 179 }, #c3687459: 181 })>, <#19e1ef85: - ({ #d121c0bd: 73, #26f32be5: 178 }, - { #0b680f7d: { #c1127ea9: 179 }, #c3687459: 72 })>, + ({ #d121c0bd: 73, #26f32be5: 179 }, + { #0b680f7d: { #c1127ea9: 180 }, #c3687459: 72 })>, <#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 50e946218a5..e709813cb98 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/Hello.m.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/Hello.m.exp @@ -3621,47 +3621,53 @@ { "pointer" : 208 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 209 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 210 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 211 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 212 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 213 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 214 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 215 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 215 + "pointer" : 216 }, { "type_ptr" : 104 @@ -3669,77 +3675,77 @@ ]], ["BuiltinType" , [ { - "pointer" : 216 + "pointer" : 217 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 217 + "pointer" : 218 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 218 + "pointer" : 219 }, "BFloat16" ]], ["PointerType" , [ { - "pointer" : 219 + "pointer" : 220 }, { - "type_ptr" : 214 + "type_ptr" : 215 } ]], ["ObjCObjectType" , [ { - "pointer" : 220 + "pointer" : 221 }, { - "base_type" : 212 + "base_type" : 213 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 221 + "pointer" : 222 }, { - "type_ptr" : 220 + "type_ptr" : 221 } ]], ["ObjCObjectType" , [ { - "pointer" : 222 + "pointer" : 223 }, { - "base_type" : 213 + "base_type" : 214 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 223 + "pointer" : 224 }, { - "type_ptr" : 222 + "type_ptr" : 223 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 224 + "pointer" : 225 }, 10 ]], ["RecordType" , [ { - "pointer" : 225 + "pointer" : 226 }, - 226 + 227 ]], ["PointerType" , [ { - "pointer" : 227 + "pointer" : 228 }, { "type_ptr" : 56, @@ -3748,7 +3754,7 @@ ]], ["PointerType" , [ { - "pointer" : 228 + "pointer" : 229 }, { "type_ptr" : 162, @@ -3757,7 +3763,7 @@ ]], ["PointerType" , [ { - "pointer" : 229 + "pointer" : 230 }, { "type_ptr" : 162 @@ -3765,17 +3771,17 @@ ]], ["RecordType" , [ { - "pointer" : 230 + "pointer" : 231 }, - 231 + 232 ]], ["ConstantArrayType" , [ { - "pointer" : 232 + "pointer" : 233 }, { "element_type" : { - "type_ptr" : 230 + "type_ptr" : 231 }, "stride" : 24 }, @@ -3783,18 +3789,18 @@ ]], ["ObjCInterfaceType" , [ { - "pointer" : 233 + "pointer" : 234 }, 18 ]], ["TypedefType" , [ { "pointer" : 7, - "desugared_type" : 221 + "desugared_type" : 222 }, { "child_type" : { - "type_ptr" : 221 + "type_ptr" : 222 }, "decl_ptr" : 6 } @@ -3802,7 +3808,7 @@ ["TypedefType" , [ { "pointer" : 21, - "desugared_type" : 221 + "desugared_type" : 222 }, { "child_type" : { @@ -3814,11 +3820,11 @@ ["TypedefType" , [ { "pointer" : 9, - "desugared_type" : 223 + "desugared_type" : 224 }, { "child_type" : { - "type_ptr" : 223 + "type_ptr" : 224 }, "decl_ptr" : 8 } @@ -3826,11 +3832,11 @@ ["TypedefType" , [ { "pointer" : 5, - "desugared_type" : 219 + "desugared_type" : 220 }, { "child_type" : { - "type_ptr" : 219 + "type_ptr" : 220 }, "decl_ptr" : 4 } @@ -3840,13 +3846,13 @@ "pointer" : 30 }, { - "type_ptr" : 233 + "type_ptr" : 234 } ]], ["ElaboratedType" , [ { "pointer" : 39, - "desugared_type" : 223 + "desugared_type" : 224 } ]], ["TypedefType" , [ @@ -3870,7 +3876,7 @@ ["ElaboratedType" , [ { "pointer" : 45, - "desugared_type" : 219 + "desugared_type" : 220 } ]], ["ObjCObjectPointerType" , [ @@ -3878,18 +3884,18 @@ "pointer" : 50 }, { - "type_ptr" : 224 + "type_ptr" : 225 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 234 + "pointer" : 235 }, 53 ]], ["ObjCInterfaceType" , [ { - "pointer" : 235 + "pointer" : 236 }, 59 ]], @@ -3916,35 +3922,35 @@ "pointer" : 63 }, { - "type_ptr" : 235 + "type_ptr" : 236 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 236 + "pointer" : 237 }, 65 ]], ["ElaboratedType" , [ { "pointer" : 74, - "desugared_type" : 221 + "desugared_type" : 222 } ]], ["IncompleteArrayType" , [ { - "pointer" : 237 + "pointer" : 238 }, { "element_type" : { - "type_ptr" : 221 + "type_ptr" : 222 }, "stride" : 8 } ]], ["IncompleteArrayType" , [ { - "pointer" : 238 + "pointer" : 239 }, { "element_type" : { @@ -3956,7 +3962,7 @@ ]], ["IncompleteArrayType" , [ { - "pointer" : 239 + "pointer" : 240 }, { "element_type" : { @@ -3968,16 +3974,16 @@ ]], ["PointerType" , [ { - "pointer" : 240 + "pointer" : 241 }, { - "type_ptr" : 221, + "type_ptr" : 222, "is_const" : true } ]], ["PointerType" , [ { - "pointer" : 241 + "pointer" : 242 }, { "type_ptr" : 74, @@ -3987,10 +3993,10 @@ ["DecayedType" , [ { "pointer" : 68, - "desugared_type" : 241 + "desugared_type" : 242 }, { - "type_ptr" : 241 + "type_ptr" : 242 } ]], ["ObjCObjectPointerType" , [ @@ -3998,21 +4004,21 @@ "pointer" : 77 }, { - "type_ptr" : 236 + "type_ptr" : 237 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 242 + "pointer" : 243 }, 79 ]], ["PointerType" , [ { - "pointer" : 243 + "pointer" : 244 }, { - "type_ptr" : 221 + "type_ptr" : 222 } ]], ["PointerType" , [ @@ -4028,18 +4034,18 @@ "pointer" : 90 }, { - "type_ptr" : 242 + "type_ptr" : 243 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 244 + "pointer" : 245 }, 92 ]], ["FunctionProtoType" , [ { - "pointer" : 245 + "pointer" : 246 }, { "return_type" : { @@ -4056,7 +4062,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 246 + "pointer" : 247 }, { "return_type" : { @@ -4073,7 +4079,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 247 + "pointer" : 248 }, { "return_type" : { @@ -4083,7 +4089,7 @@ { "params_type" : [ { - "type_ptr" : 221 + "type_ptr" : 222 } ] } @@ -4133,10 +4139,10 @@ ]], ["PointerType" , [ { - "pointer" : 248 + "pointer" : 249 }, { - "type_ptr" : 247 + "type_ptr" : 248 } ]], ["PointerType" , [ @@ -4149,35 +4155,35 @@ ]], ["IncompleteArrayType" , [ { - "pointer" : 249 + "pointer" : 250 }, { "element_type" : { - "type_ptr" : 229 + "type_ptr" : 230 }, "stride" : 8 } ]], ["PointerType" , [ { - "pointer" : 250 + "pointer" : 251 }, { - "type_ptr" : 229 + "type_ptr" : 230 } ]], ["DecayedType" , [ { "pointer" : 135, - "desugared_type" : 250 + "desugared_type" : 251 }, { - "type_ptr" : 250 + "type_ptr" : 251 } ]], ["FunctionProtoType" , [ { - "pointer" : 251 + "pointer" : 252 }, { "return_type" : { @@ -4190,7 +4196,7 @@ "type_ptr" : 56 }, { - "type_ptr" : 250 + "type_ptr" : 251 } ] } diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCBridgeTransferTest.m.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCBridgeTransferTest.m.exp index c86e7499d0d..3635632c592 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCBridgeTransferTest.m.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCBridgeTransferTest.m.exp @@ -2966,47 +2966,53 @@ { "pointer" : 176 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 177 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 178 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 179 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 180 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 181 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 182 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 183 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 183 + "pointer" : 184 }, { "type_ptr" : 112 @@ -3014,77 +3020,77 @@ ]], ["BuiltinType" , [ { - "pointer" : 184 + "pointer" : 185 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 185 + "pointer" : 186 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 186 + "pointer" : 187 }, "BFloat16" ]], ["PointerType" , [ { - "pointer" : 187 + "pointer" : 188 }, { - "type_ptr" : 182 + "type_ptr" : 183 } ]], ["ObjCObjectType" , [ { - "pointer" : 188 + "pointer" : 189 }, { - "base_type" : 180 + "base_type" : 181 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 189 + "pointer" : 190 }, { - "type_ptr" : 188 + "type_ptr" : 189 } ]], ["ObjCObjectType" , [ { - "pointer" : 190 + "pointer" : 191 }, { - "base_type" : 181 + "base_type" : 182 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 191 + "pointer" : 192 }, { - "type_ptr" : 190 + "type_ptr" : 191 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 192 + "pointer" : 193 }, 10 ]], ["RecordType" , [ { - "pointer" : 193 + "pointer" : 194 }, - 194 + 195 ]], ["PointerType" , [ { - "pointer" : 195 + "pointer" : 196 }, { "type_ptr" : 56, @@ -3093,7 +3099,7 @@ ]], ["PointerType" , [ { - "pointer" : 196 + "pointer" : 197 }, { "type_ptr" : 130, @@ -3102,7 +3108,7 @@ ]], ["PointerType" , [ { - "pointer" : 197 + "pointer" : 198 }, { "type_ptr" : 130 @@ -3110,17 +3116,17 @@ ]], ["RecordType" , [ { - "pointer" : 198 + "pointer" : 199 }, - 199 + 200 ]], ["ConstantArrayType" , [ { - "pointer" : 200 + "pointer" : 201 }, { "element_type" : { - "type_ptr" : 198 + "type_ptr" : 199 }, "stride" : 24 }, @@ -3128,18 +3134,18 @@ ]], ["ObjCInterfaceType" , [ { - "pointer" : 201 + "pointer" : 202 }, 18 ]], ["TypedefType" , [ { "pointer" : 7, - "desugared_type" : 189 + "desugared_type" : 190 }, { "child_type" : { - "type_ptr" : 189 + "type_ptr" : 190 }, "decl_ptr" : 6 } @@ -3147,7 +3153,7 @@ ["TypedefType" , [ { "pointer" : 21, - "desugared_type" : 189 + "desugared_type" : 190 }, { "child_type" : { @@ -3159,11 +3165,11 @@ ["TypedefType" , [ { "pointer" : 9, - "desugared_type" : 191 + "desugared_type" : 192 }, { "child_type" : { - "type_ptr" : 191 + "type_ptr" : 192 }, "decl_ptr" : 8 } @@ -3171,11 +3177,11 @@ ["TypedefType" , [ { "pointer" : 5, - "desugared_type" : 187 + "desugared_type" : 188 }, { "child_type" : { - "type_ptr" : 187 + "type_ptr" : 188 }, "decl_ptr" : 4 } @@ -3185,13 +3191,13 @@ "pointer" : 30 }, { - "type_ptr" : 201 + "type_ptr" : 202 } ]], ["ElaboratedType" , [ { "pointer" : 39, - "desugared_type" : 191 + "desugared_type" : 192 } ]], ["TypedefType" , [ @@ -3215,7 +3221,7 @@ ["ElaboratedType" , [ { "pointer" : 45, - "desugared_type" : 187 + "desugared_type" : 188 } ]], ["ObjCObjectPointerType" , [ @@ -3223,18 +3229,18 @@ "pointer" : 50 }, { - "type_ptr" : 192 + "type_ptr" : 193 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 202 + "pointer" : 203 }, 53 ]], ["ObjCInterfaceType" , [ { - "pointer" : 203 + "pointer" : 204 }, 59 ]], @@ -3261,35 +3267,35 @@ "pointer" : 63 }, { - "type_ptr" : 203 + "type_ptr" : 204 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 204 + "pointer" : 205 }, 65 ]], ["ElaboratedType" , [ { "pointer" : 74, - "desugared_type" : 189 + "desugared_type" : 190 } ]], ["IncompleteArrayType" , [ { - "pointer" : 205 + "pointer" : 206 }, { "element_type" : { - "type_ptr" : 189 + "type_ptr" : 190 }, "stride" : 8 } ]], ["IncompleteArrayType" , [ { - "pointer" : 206 + "pointer" : 207 }, { "element_type" : { @@ -3301,7 +3307,7 @@ ]], ["IncompleteArrayType" , [ { - "pointer" : 207 + "pointer" : 208 }, { "element_type" : { @@ -3313,16 +3319,16 @@ ]], ["PointerType" , [ { - "pointer" : 208 + "pointer" : 209 }, { - "type_ptr" : 189, + "type_ptr" : 190, "is_const" : true } ]], ["PointerType" , [ { - "pointer" : 209 + "pointer" : 210 }, { "type_ptr" : 74, @@ -3332,10 +3338,10 @@ ["DecayedType" , [ { "pointer" : 68, - "desugared_type" : 209 + "desugared_type" : 210 }, { - "type_ptr" : 209 + "type_ptr" : 210 } ]], ["ObjCObjectPointerType" , [ @@ -3343,21 +3349,21 @@ "pointer" : 77 }, { - "type_ptr" : 204 + "type_ptr" : 205 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 210 + "pointer" : 211 }, 79 ]], ["PointerType" , [ { - "pointer" : 211 + "pointer" : 212 }, { - "type_ptr" : 189 + "type_ptr" : 190 } ]], ["PointerType" , [ @@ -3373,18 +3379,18 @@ "pointer" : 90 }, { - "type_ptr" : 210 + "type_ptr" : 211 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 212 + "pointer" : 213 }, 92 ]], ["FunctionProtoType" , [ { - "pointer" : 213 + "pointer" : 214 }, { "return_type" : { @@ -3401,7 +3407,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 214 + "pointer" : 215 }, { "return_type" : { @@ -3418,7 +3424,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 215 + "pointer" : 216 }, { "return_type" : { @@ -3428,7 +3434,7 @@ { "params_type" : [ { - "type_ptr" : 189 + "type_ptr" : 190 } ] } @@ -3458,13 +3464,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 216, + "pointer" : 217, "desugared_type" : 103 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 217 + "pointer" : 218 }, 106 ]], @@ -3475,20 +3481,20 @@ }, { "child_type" : { - "type_ptr" : 216 + "type_ptr" : 217 }, "decl_ptr" : 104 } ]], ["ElaboratedType" , [ { - "pointer" : 218, + "pointer" : 219, "desugared_type" : 103 } ]], ["PointerType" , [ { - "pointer" : 219 + "pointer" : 220 }, { "type_ptr" : 103 @@ -3499,16 +3505,16 @@ "pointer" : 125 }, { - "type_ptr" : 218 + "type_ptr" : 219 } ]], ["FunctionNoProtoType" , [ { - "pointer" : 220 + "pointer" : 221 }, { "return_type" : { - "type_ptr" : 219 + "type_ptr" : 220 } } ]], @@ -3524,7 +3530,7 @@ ]], ["ObjCInterfaceType" , [ { - "pointer" : 221 + "pointer" : 222 }, 109 ]], @@ -3533,7 +3539,7 @@ "pointer" : 114 }, { - "type_ptr" : 221 + "type_ptr" : 222 } ]], ["ObjCObjectPointerType" , [ @@ -3541,15 +3547,15 @@ "pointer" : 126 }, { - "type_ptr" : 217 + "type_ptr" : 218 } ]], ["PointerType" , [ { - "pointer" : 222 + "pointer" : 223 }, { - "type_ptr" : 220 + "type_ptr" : 221 } ]], ["PointerType" , [ diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCTest.m.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCTest.m.exp index a59f2e9f35c..8ecbc9bca95 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCTest.m.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/ObjCTest.m.exp @@ -14221,6 +14221,12 @@ }, "BoundMember" ]], + ["BuiltinType" , [ + { + "pointer" : 473 + }, + "UnresolvedTemplate" + ]], ["BuiltinType" , [ { "pointer" : 212 @@ -14229,37 +14235,37 @@ ]], ["BuiltinType" , [ { - "pointer" : 473 + "pointer" : 474 }, "UnknownAny" ]], ["BuiltinType" , [ { - "pointer" : 474 + "pointer" : 475 }, "ARCUnbridgedCast" ]], ["BuiltinType" , [ { - "pointer" : 475 + "pointer" : 476 }, "BuiltinFn" ]], ["BuiltinType" , [ { - "pointer" : 476 + "pointer" : 477 }, "ObjCId" ]], ["BuiltinType" , [ { - "pointer" : 477 + "pointer" : 478 }, "ObjCClass" ]], ["BuiltinType" , [ { - "pointer" : 478 + "pointer" : 479 }, "ObjCSel" ]], @@ -14273,77 +14279,77 @@ ]], ["BuiltinType" , [ { - "pointer" : 479 + "pointer" : 480 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 480 + "pointer" : 481 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 481 + "pointer" : 482 }, "BFloat16" ]], ["PointerType" , [ { - "pointer" : 482 + "pointer" : 483 }, { - "type_ptr" : 478 + "type_ptr" : 479 } ]], ["ObjCObjectType" , [ { - "pointer" : 483 + "pointer" : 484 }, { - "base_type" : 476 + "base_type" : 477 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 484 + "pointer" : 485 }, { - "type_ptr" : 483 + "type_ptr" : 484 } ]], ["ObjCObjectType" , [ { - "pointer" : 485 + "pointer" : 486 }, { - "base_type" : 477 + "base_type" : 478 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 486 + "pointer" : 487 }, { - "type_ptr" : 485 + "type_ptr" : 486 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 487 + "pointer" : 488 }, 10 ]], ["RecordType" , [ { - "pointer" : 488 + "pointer" : 489 }, - 489 + 490 ]], ["PointerType" , [ { - "pointer" : 490 + "pointer" : 491 }, { "type_ptr" : 56, @@ -14352,7 +14358,7 @@ ]], ["PointerType" , [ { - "pointer" : 491 + "pointer" : 492 }, { "type_ptr" : 427, @@ -14369,17 +14375,17 @@ ]], ["RecordType" , [ { - "pointer" : 492 + "pointer" : 493 }, - 493 + 494 ]], ["ConstantArrayType" , [ { - "pointer" : 494 + "pointer" : 495 }, { "element_type" : { - "type_ptr" : 492 + "type_ptr" : 493 }, "stride" : 24 }, @@ -14387,18 +14393,18 @@ ]], ["ObjCInterfaceType" , [ { - "pointer" : 495 + "pointer" : 496 }, 18 ]], ["TypedefType" , [ { "pointer" : 7, - "desugared_type" : 484 + "desugared_type" : 485 }, { "child_type" : { - "type_ptr" : 484 + "type_ptr" : 485 }, "decl_ptr" : 6 } @@ -14406,7 +14412,7 @@ ["TypedefType" , [ { "pointer" : 21, - "desugared_type" : 484 + "desugared_type" : 485 }, { "child_type" : { @@ -14418,11 +14424,11 @@ ["TypedefType" , [ { "pointer" : 9, - "desugared_type" : 486 + "desugared_type" : 487 }, { "child_type" : { - "type_ptr" : 486 + "type_ptr" : 487 }, "decl_ptr" : 8 } @@ -14430,11 +14436,11 @@ ["TypedefType" , [ { "pointer" : 5, - "desugared_type" : 482 + "desugared_type" : 483 }, { "child_type" : { - "type_ptr" : 482 + "type_ptr" : 483 }, "decl_ptr" : 4 } @@ -14444,13 +14450,13 @@ "pointer" : 30 }, { - "type_ptr" : 495 + "type_ptr" : 496 } ]], ["ElaboratedType" , [ { "pointer" : 39, - "desugared_type" : 486 + "desugared_type" : 487 } ]], ["TypedefType" , [ @@ -14474,7 +14480,7 @@ ["ElaboratedType" , [ { "pointer" : 45, - "desugared_type" : 482 + "desugared_type" : 483 } ]], ["ObjCObjectPointerType" , [ @@ -14482,18 +14488,18 @@ "pointer" : 50 }, { - "type_ptr" : 487 + "type_ptr" : 488 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 496 + "pointer" : 497 }, 53 ]], ["ObjCInterfaceType" , [ { - "pointer" : 497 + "pointer" : 498 }, 59 ]], @@ -14520,35 +14526,35 @@ "pointer" : 63 }, { - "type_ptr" : 497 + "type_ptr" : 498 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 498 + "pointer" : 499 }, 65 ]], ["ElaboratedType" , [ { "pointer" : 74, - "desugared_type" : 484 + "desugared_type" : 485 } ]], ["IncompleteArrayType" , [ { - "pointer" : 499 + "pointer" : 500 }, { "element_type" : { - "type_ptr" : 484 + "type_ptr" : 485 }, "stride" : 8 } ]], ["IncompleteArrayType" , [ { - "pointer" : 500 + "pointer" : 501 }, { "element_type" : { @@ -14560,7 +14566,7 @@ ]], ["IncompleteArrayType" , [ { - "pointer" : 501 + "pointer" : 502 }, { "element_type" : { @@ -14572,16 +14578,16 @@ ]], ["PointerType" , [ { - "pointer" : 502 + "pointer" : 503 }, { - "type_ptr" : 484, + "type_ptr" : 485, "is_const" : true } ]], ["PointerType" , [ { - "pointer" : 503 + "pointer" : 504 }, { "type_ptr" : 74, @@ -14591,10 +14597,10 @@ ["DecayedType" , [ { "pointer" : 68, - "desugared_type" : 503 + "desugared_type" : 504 }, { - "type_ptr" : 503 + "type_ptr" : 504 } ]], ["ObjCObjectPointerType" , [ @@ -14602,21 +14608,21 @@ "pointer" : 77 }, { - "type_ptr" : 498 + "type_ptr" : 499 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 504 + "pointer" : 505 }, 79 ]], ["PointerType" , [ { - "pointer" : 505 + "pointer" : 506 }, { - "type_ptr" : 484 + "type_ptr" : 485 } ]], ["PointerType" , [ @@ -14632,18 +14638,18 @@ "pointer" : 90 }, { - "type_ptr" : 504 + "type_ptr" : 505 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 506 + "pointer" : 507 }, 92 ]], ["FunctionProtoType" , [ { - "pointer" : 507 + "pointer" : 508 }, { "return_type" : { @@ -14660,7 +14666,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 508 + "pointer" : 509 }, { "return_type" : { @@ -14677,7 +14683,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 509 + "pointer" : 510 }, { "return_type" : { @@ -14687,7 +14693,7 @@ { "params_type" : [ { - "type_ptr" : 484 + "type_ptr" : 485 } ] } @@ -14717,10 +14723,10 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 510 + "pointer" : 511 }, { - "base_type" : 495, + "base_type" : 496, "protocol_decls_ptr" : [ 112 ] @@ -14731,7 +14737,7 @@ "pointer" : 128 }, { - "type_ptr" : 510 + "type_ptr" : 511 } ]], ["ObjCObjectPointerType" , [ @@ -14765,7 +14771,7 @@ ]], ["PointerType" , [ { - "pointer" : 511 + "pointer" : 512 }, { "type_ptr" : 56 @@ -14776,15 +14782,15 @@ "pointer" : 176 }, { - "type_ptr" : 511 + "type_ptr" : 512 } ]], ["PointerType" , [ { - "pointer" : 512 + "pointer" : 513 }, { - "type_ptr" : 509 + "type_ptr" : 510 } ]], ["PointerType" , [ @@ -14797,7 +14803,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 513 + "pointer" : 514 }, { "return_type" : { @@ -14814,7 +14820,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 514 + "pointer" : 515 }, { "return_type" : { @@ -14831,19 +14837,19 @@ ]], ["ParenType" , [ { - "pointer" : 515, - "desugared_type" : 514 + "pointer" : 516, + "desugared_type" : 515 }, { - "type_ptr" : 514 + "type_ptr" : 515 } ]], ["BlockPointerType" , [ { - "pointer" : 516 + "pointer" : 517 }, { - "type_ptr" : 513 + "type_ptr" : 514 } ]], ["BlockPointerType" , [ @@ -14851,12 +14857,12 @@ "pointer" : 224 }, { - "type_ptr" : 515 + "type_ptr" : 516 } ]], ["FunctionProtoType" , [ { - "pointer" : 517 + "pointer" : 518 }, { "return_type" : { @@ -14873,7 +14879,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 518 + "pointer" : 519 }, { "return_type" : { @@ -14893,7 +14899,7 @@ "pointer" : 202 }, { - "type_ptr" : 514 + "type_ptr" : 515 } ]], ["ObjCObjectPointerType" , [ @@ -14901,7 +14907,7 @@ "pointer" : 235 }, { - "type_ptr" : 496 + "type_ptr" : 497 } ]], ["ConstantArrayType" , [ @@ -14921,7 +14927,7 @@ "pointer" : 296 }, { - "type_ptr" : 506 + "type_ptr" : 507 } ]], ["ConstantArrayType" , [ @@ -14962,28 +14968,28 @@ ]], ["ObjCTypeParamType" , [ { - "pointer" : 519, - "desugared_type" : 484 + "pointer" : 520, + "desugared_type" : 485 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 520 + "pointer" : 521 }, 372 ]], ["ObjCInterfaceType" , [ { - "pointer" : 521 + "pointer" : 522 }, 373 ]], ["ObjCObjectType" , [ { - "pointer" : 522 + "pointer" : 523 }, { - "base_type" : 520, + "base_type" : 521, "type_args" : [ { "type_ptr" : 30 @@ -14996,12 +15002,12 @@ "pointer" : 377 }, { - "type_ptr" : 522 + "type_ptr" : 523 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 523 + "pointer" : 524 }, 380 ]], @@ -15010,7 +15016,7 @@ "pointer" : 385 }, { - "type_ptr" : 523 + "type_ptr" : 524 } ]], ["PointerType" , [ 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 6a1c2db885a..bb8cb798edf 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/bind_temporary.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/bind_temporary.cpp.exp @@ -1109,47 +1109,53 @@ { "pointer" : 86 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 87 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 88 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 89 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 90 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 91 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 92 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 93 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 93 + "pointer" : 94 }, { "type_ptr" : 34 @@ -1157,31 +1163,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 94 + "pointer" : 95 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 95 + "pointer" : 96 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 96 + "pointer" : 97 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 97 + "pointer" : 98 }, - 98 + 99 ]], ["PointerType" , [ { - "pointer" : 99 + "pointer" : 100 }, { "type_ptr" : 39, @@ -1190,7 +1196,7 @@ ]], ["PointerType" , [ { - "pointer" : 100 + "pointer" : 101 }, { "type_ptr" : 36, @@ -1199,7 +1205,7 @@ ]], ["PointerType" , [ { - "pointer" : 101 + "pointer" : 102 }, { "type_ptr" : 36 @@ -1207,17 +1213,17 @@ ]], ["RecordType" , [ { - "pointer" : 102 + "pointer" : 103 }, - 103 + 104 ]], ["ConstantArrayType" , [ { - "pointer" : 104 + "pointer" : 105 }, { "element_type" : { - "type_ptr" : 102 + "type_ptr" : 103 }, "stride" : 24 }, @@ -1231,7 +1237,7 @@ ]], ["PointerType" , [ { - "pointer" : 105 + "pointer" : 106 }, { "type_ptr" : 8 @@ -1257,7 +1263,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 106 + "pointer" : 107 }, { "return_type" : { @@ -1281,7 +1287,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 107 + "pointer" : 108 }, { "type_ptr" : 8, @@ -1299,7 +1305,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 108 + "pointer" : 109 }, { "return_type" : { @@ -1309,7 +1315,7 @@ { "params_type" : [ { - "type_ptr" : 107 + "type_ptr" : 108 } ] } @@ -1333,7 +1339,7 @@ ]], ["PointerType" , [ { - "pointer" : 109 + "pointer" : 110 }, { "type_ptr" : 29 @@ -1341,7 +1347,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 110 + "pointer" : 111 }, { "type_ptr" : 8 @@ -1349,40 +1355,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 111 + "pointer" : 112 }, { - "base_type" : 90 + "base_type" : 91 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 112 + "pointer" : 113 }, { - "type_ptr" : 111 + "type_ptr" : 112 } ]], ["TypedefType" , [ { - "pointer" : 113, - "desugared_type" : 112 + "pointer" : 114, + "desugared_type" : 113 }, { "child_type" : { - "type_ptr" : 112 + "type_ptr" : 113 }, - "decl_ptr" : 114 + "decl_ptr" : 115 } ]], ["TypedefType" , [ { "pointer" : 33, - "desugared_type" : 112 + "desugared_type" : 113 }, { "child_type" : { - "type_ptr" : 113 + "type_ptr" : 114 }, "decl_ptr" : 32 } 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 21ce3d85e28..8508ba192f9 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_attributes.c.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_attributes.c.exp @@ -527,47 +527,53 @@ { "pointer" : 63 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 64 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 65 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 66 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 67 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 68 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 69 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 70 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 70 + "pointer" : 71 }, { "type_ptr" : 14 @@ -575,31 +581,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 71 + "pointer" : 72 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 72 + "pointer" : 73 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 73 + "pointer" : 74 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 74 + "pointer" : 75 }, - 75 + 76 ]], ["PointerType" , [ { - "pointer" : 76 + "pointer" : 77 }, { "type_ptr" : 11, @@ -608,7 +614,7 @@ ]], ["PointerType" , [ { - "pointer" : 77 + "pointer" : 78 }, { "type_ptr" : 16, @@ -617,7 +623,7 @@ ]], ["PointerType" , [ { - "pointer" : 78 + "pointer" : 79 }, { "type_ptr" : 16 @@ -625,17 +631,17 @@ ]], ["RecordType" , [ { - "pointer" : 79 + "pointer" : 80 }, - 80 + 81 ]], ["ConstantArrayType" , [ { - "pointer" : 81 + "pointer" : 82 }, { "element_type" : { - "type_ptr" : 79 + "type_ptr" : 80 }, "stride" : 24 }, @@ -660,40 +666,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 82 + "pointer" : 83 }, { - "base_type" : 67 + "base_type" : 68 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 83 + "pointer" : 84 }, { - "type_ptr" : 82 + "type_ptr" : 83 } ]], ["TypedefType" , [ { - "pointer" : 84, - "desugared_type" : 83 + "pointer" : 85, + "desugared_type" : 84 }, { "child_type" : { - "type_ptr" : 83 + "type_ptr" : 84 }, - "decl_ptr" : 85 + "decl_ptr" : 86 } ]], ["TypedefType" , [ { "pointer" : 13, - "desugared_type" : 83 + "desugared_type" : 84 }, { "child_type" : { - "type_ptr" : 84 + "type_ptr" : 85 }, "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 3c63a0a6805..a03b9410b9a 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_cast.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/c_cast.cpp.exp @@ -791,47 +791,53 @@ { "pointer" : 73 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 74 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 75 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 76 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 77 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 78 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 79 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 80 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 80 + "pointer" : 81 }, { "type_ptr" : 23 @@ -839,31 +845,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 81 + "pointer" : 82 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 82 + "pointer" : 83 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 83 + "pointer" : 84 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 84 + "pointer" : 85 }, - 85 + 86 ]], ["PointerType" , [ { - "pointer" : 86 + "pointer" : 87 }, { "type_ptr" : 8, @@ -872,7 +878,7 @@ ]], ["PointerType" , [ { - "pointer" : 87 + "pointer" : 88 }, { "type_ptr" : 25, @@ -881,7 +887,7 @@ ]], ["PointerType" , [ { - "pointer" : 88 + "pointer" : 89 }, { "type_ptr" : 25 @@ -889,17 +895,17 @@ ]], ["RecordType" , [ { - "pointer" : 89 + "pointer" : 90 }, - 90 + 91 ]], ["ConstantArrayType" , [ { - "pointer" : 91 + "pointer" : 92 }, { "element_type" : { - "type_ptr" : 89 + "type_ptr" : 90 }, "stride" : 24 }, @@ -907,40 +913,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 92 + "pointer" : 93 }, { - "base_type" : 77 + "base_type" : 78 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 93 + "pointer" : 94 }, { - "type_ptr" : 92 + "type_ptr" : 93 } ]], ["TypedefType" , [ { - "pointer" : 94, - "desugared_type" : 93 + "pointer" : 95, + "desugared_type" : 94 }, { "child_type" : { - "type_ptr" : 93 + "type_ptr" : 94 }, - "decl_ptr" : 95 + "decl_ptr" : 96 } ]], ["TypedefType" , [ { "pointer" : 22, - "desugared_type" : 93 + "desugared_type" : 94 }, { "child_type" : { - "type_ptr" : 94 + "type_ptr" : 95 }, "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 6f23658295e..f0eaf8942cd 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/class_template.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/class_template.cpp.exp @@ -2109,47 +2109,53 @@ { "pointer" : 137 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 138 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 139 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 140 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 141 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 142 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 143 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 144 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 144 + "pointer" : 145 }, { "type_ptr" : 86 @@ -2157,31 +2163,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 145 + "pointer" : 146 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 146 + "pointer" : 147 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 147 + "pointer" : 148 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 148 + "pointer" : 149 }, - 149 + 150 ]], ["PointerType" , [ { - "pointer" : 150 + "pointer" : 151 }, { "type_ptr" : 38, @@ -2190,7 +2196,7 @@ ]], ["PointerType" , [ { - "pointer" : 151 + "pointer" : 152 }, { "type_ptr" : 88, @@ -2199,7 +2205,7 @@ ]], ["PointerType" , [ { - "pointer" : 152 + "pointer" : 153 }, { "type_ptr" : 88 @@ -2207,17 +2213,17 @@ ]], ["RecordType" , [ { - "pointer" : 153 + "pointer" : 154 }, - 154 + 155 ]], ["ConstantArrayType" , [ { - "pointer" : 155 + "pointer" : 156 }, { "element_type" : { - "type_ptr" : 153 + "type_ptr" : 154 }, "stride" : 24 }, @@ -2225,27 +2231,27 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 156 + "pointer" : 157 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 157 + "pointer" : 158 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 158 + "pointer" : 159 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 159 + "pointer" : 160 } ]], ["InjectedClassNameType" , [ { - "pointer" : 160 + "pointer" : 161 } ]], ["TemplateTypeParmType" , [ @@ -2258,12 +2264,12 @@ "pointer" : 33 }, { - "type_ptr" : 156 + "type_ptr" : 157 } ]], ["PointerType" , [ { - "pointer" : 161 + "pointer" : 162 }, { "type_ptr" : 32 @@ -2271,12 +2277,12 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 162 + "pointer" : 163 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 163 + "pointer" : 164 } ]], ["InjectedClassNameType" , [ @@ -2284,11 +2290,6 @@ "pointer" : 29 } ]], - ["TemplateSpecializationType" , [ - { - "pointer" : 164 - } - ]], ["RecordType" , [ { "pointer" : 35 @@ -2301,12 +2302,6 @@ "desugared_type" : 35 } ]], - ["TemplateSpecializationType" , [ - { - "pointer" : 166, - "desugared_type" : 35 - } - ]], ["ElaboratedType" , [ { "pointer" : 70, @@ -2315,7 +2310,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 167 + "pointer" : 166 }, { "return_type" : { @@ -2349,13 +2344,13 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 168, + "pointer" : 167, "desugared_type" : 35 } ]], ["ElaboratedType" , [ { - "pointer" : 169, + "pointer" : 168, "desugared_type" : 35 } ]], @@ -2369,10 +2364,10 @@ ]], ["PointerType" , [ { - "pointer" : 170 + "pointer" : 169 }, { - "type_ptr" : 169 + "type_ptr" : 168 } ]], ["RecordType" , [ @@ -2383,7 +2378,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 171, + "pointer" : 170, "desugared_type" : 10 } ]], @@ -2401,7 +2396,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 172 + "pointer" : 171 }, { "return_type" : { @@ -2413,7 +2408,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 173 + "pointer" : 172 }, { "return_type" : { @@ -2425,7 +2420,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 174 + "pointer" : 173 }, { "return_type" : { @@ -2449,13 +2444,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 175, + "pointer" : 174, "desugared_type" : 10 } ]], ["LValueReferenceType" , [ { - "pointer" : 176 + "pointer" : 175 }, { "type_ptr" : 10, @@ -2467,7 +2462,7 @@ "pointer" : 22 }, { - "type_ptr" : 175, + "type_ptr" : 174, "is_const" : true } ]], @@ -2479,7 +2474,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 177 + "pointer" : 176 }, { "type_ptr" : 35, @@ -2497,7 +2492,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 178 + "pointer" : 177 }, { "return_type" : { @@ -2507,7 +2502,7 @@ { "params_type" : [ { - "type_ptr" : 177 + "type_ptr" : 176 } ] } @@ -2531,7 +2526,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 179 + "pointer" : 178 }, { "type_ptr" : 35 @@ -2547,7 +2542,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 180 + "pointer" : 179 }, { "return_type" : { @@ -2557,7 +2552,7 @@ { "params_type" : [ { - "type_ptr" : 179 + "type_ptr" : 178 } ] } @@ -2581,7 +2576,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 181 + "pointer" : 180 }, { "return_type" : { @@ -2591,7 +2586,7 @@ { "params_type" : [ { - "type_ptr" : 176 + "type_ptr" : 175 } ] } @@ -2615,7 +2610,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 182 + "pointer" : 181 }, { "type_ptr" : 10 @@ -2626,12 +2621,12 @@ "pointer" : 26 }, { - "type_ptr" : 175 + "type_ptr" : 174 } ]], ["FunctionProtoType" , [ { - "pointer" : 183 + "pointer" : 182 }, { "return_type" : { @@ -2641,7 +2636,7 @@ { "params_type" : [ { - "type_ptr" : 182 + "type_ptr" : 181 } ] } @@ -2677,7 +2672,7 @@ ]], ["PointerType" , [ { - "pointer" : 184 + "pointer" : 183 }, { "type_ptr" : 13 @@ -2685,7 +2680,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 185 + "pointer" : 184 }, { "type_ptr" : 35 @@ -2693,7 +2688,7 @@ ]], ["PointerType" , [ { - "pointer" : 186 + "pointer" : 185 }, { "type_ptr" : 10 @@ -2701,7 +2696,7 @@ ]], ["PointerType" , [ { - "pointer" : 187 + "pointer" : 186 }, { "type_ptr" : 74 @@ -2709,7 +2704,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 188 + "pointer" : 187 }, { "type_ptr" : 10 @@ -2717,7 +2712,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 189 + "pointer" : 188 }, { "type_ptr" : 60 @@ -2725,28 +2720,28 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 190 + "pointer" : 189 }, { "return_type" : { - "type_ptr" : 185 + "type_ptr" : 184 } }, { "params_type" : [ { - "type_ptr" : 177 + "type_ptr" : 176 } ] } ]], ["FunctionProtoType" , [ { - "pointer" : 191 + "pointer" : 190 }, { "return_type" : { - "type_ptr" : 189 + "type_ptr" : 188 } }, { @@ -2759,17 +2754,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 192 + "pointer" : 191 }, { "return_type" : { - "type_ptr" : 185 + "type_ptr" : 184 } }, { "params_type" : [ { - "type_ptr" : 179 + "type_ptr" : 178 } ] } @@ -2780,7 +2775,7 @@ }, { "return_type" : { - "type_ptr" : 189 + "type_ptr" : 188 } }, { @@ -2797,7 +2792,7 @@ }, { "return_type" : { - "type_ptr" : 189 + "type_ptr" : 188 } }, { @@ -2810,10 +2805,10 @@ ]], ["PointerType" , [ { - "pointer" : 193 + "pointer" : 192 }, { - "type_ptr" : 190 + "type_ptr" : 189 } ]], ["PointerType" , [ @@ -2826,40 +2821,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 194 + "pointer" : 193 }, { - "base_type" : 141 + "base_type" : 142 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 195 + "pointer" : 194 }, { - "type_ptr" : 194 + "type_ptr" : 193 } ]], ["TypedefType" , [ { - "pointer" : 196, - "desugared_type" : 195 + "pointer" : 195, + "desugared_type" : 194 }, { "child_type" : { - "type_ptr" : 195 + "type_ptr" : 194 }, - "decl_ptr" : 197 + "decl_ptr" : 196 } ]], ["TypedefType" , [ { "pointer" : 85, - "desugared_type" : 195 + "desugared_type" : 194 }, { "child_type" : { - "type_ptr" : 196 + "type_ptr" : 195 }, "decl_ptr" : 84 } diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/comments.c.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/comments.c.exp index d42cffbeba8..2b7e56445e2 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/comments.c.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/comments.c.exp @@ -498,47 +498,53 @@ { "pointer" : 62 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 63 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 64 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 65 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 66 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 67 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 68 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 69 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 69 + "pointer" : 70 }, { "type_ptr" : 12 @@ -546,31 +552,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 70 + "pointer" : 71 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 71 + "pointer" : 72 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 72 + "pointer" : 73 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 73 + "pointer" : 74 }, - 74 + 75 ]], ["PointerType" , [ { - "pointer" : 75 + "pointer" : 76 }, { "type_ptr" : 17, @@ -579,7 +585,7 @@ ]], ["PointerType" , [ { - "pointer" : 76 + "pointer" : 77 }, { "type_ptr" : 14, @@ -588,7 +594,7 @@ ]], ["PointerType" , [ { - "pointer" : 77 + "pointer" : 78 }, { "type_ptr" : 14 @@ -596,17 +602,17 @@ ]], ["RecordType" , [ { - "pointer" : 78 + "pointer" : 79 }, - 79 + 80 ]], ["ConstantArrayType" , [ { - "pointer" : 80 + "pointer" : 81 }, { "element_type" : { - "type_ptr" : 78 + "type_ptr" : 79 }, "stride" : 24 }, @@ -624,40 +630,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 81 + "pointer" : 82 }, { - "base_type" : 66 + "base_type" : 67 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 82 + "pointer" : 83 }, { - "type_ptr" : 81 + "type_ptr" : 82 } ]], ["TypedefType" , [ { - "pointer" : 83, - "desugared_type" : 82 + "pointer" : 84, + "desugared_type" : 83 }, { "child_type" : { - "type_ptr" : 82 + "type_ptr" : 83 }, - "decl_ptr" : 84 + "decl_ptr" : 85 } ]], ["TypedefType" , [ { "pointer" : 11, - "desugared_type" : 82 + "desugared_type" : 83 }, { "child_type" : { - "type_ptr" : 83 + "type_ptr" : 84 }, "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 b27cdbb8617..4ab11b79421 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/const_cast.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/const_cast.cpp.exp @@ -1007,47 +1007,53 @@ { "pointer" : 84 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 85 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 86 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 87 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 88 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 89 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 90 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 91 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 91 + "pointer" : 92 }, { "type_ptr" : 29 @@ -1055,31 +1061,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 92 + "pointer" : 93 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 93 + "pointer" : 94 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 94 + "pointer" : 95 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 95 + "pointer" : 96 }, - 96 + 97 ]], ["PointerType" , [ { - "pointer" : 97 + "pointer" : 98 }, { "type_ptr" : 31, @@ -1088,7 +1094,7 @@ ]], ["PointerType" , [ { - "pointer" : 98 + "pointer" : 99 }, { "type_ptr" : 36, @@ -1097,7 +1103,7 @@ ]], ["PointerType" , [ { - "pointer" : 99 + "pointer" : 100 }, { "type_ptr" : 36 @@ -1105,17 +1111,17 @@ ]], ["RecordType" , [ { - "pointer" : 100 + "pointer" : 101 }, - 101 + 102 ]], ["ConstantArrayType" , [ { - "pointer" : 102 + "pointer" : 103 }, { "element_type" : { - "type_ptr" : 100 + "type_ptr" : 101 }, "stride" : 24 }, @@ -1129,7 +1135,7 @@ ]], ["PointerType" , [ { - "pointer" : 103 + "pointer" : 104 }, { "type_ptr" : 8 @@ -1155,7 +1161,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 104 + "pointer" : 105 }, { "type_ptr" : 8, @@ -1173,7 +1179,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 105 + "pointer" : 106 }, { "return_type" : { @@ -1183,7 +1189,7 @@ { "params_type" : [ { - "type_ptr" : 104 + "type_ptr" : 105 } ] } @@ -1207,7 +1213,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 106 + "pointer" : 107 }, { "type_ptr" : 8 @@ -1223,7 +1229,7 @@ ]], ["PointerType" , [ { - "pointer" : 107 + "pointer" : 108 }, { "type_ptr" : 8, @@ -1232,7 +1238,7 @@ ]], ["PointerType" , [ { - "pointer" : 108 + "pointer" : 109 }, { "type_ptr" : 22, @@ -1241,7 +1247,7 @@ ]], ["PointerType" , [ { - "pointer" : 109 + "pointer" : 110 }, { "type_ptr" : 22 @@ -1249,40 +1255,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 110 + "pointer" : 111 }, { - "base_type" : 88 + "base_type" : 89 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 111 + "pointer" : 112 }, { - "type_ptr" : 110 + "type_ptr" : 111 } ]], ["TypedefType" , [ { - "pointer" : 112, - "desugared_type" : 111 + "pointer" : 113, + "desugared_type" : 112 }, { "child_type" : { - "type_ptr" : 111 + "type_ptr" : 112 }, - "decl_ptr" : 113 + "decl_ptr" : 114 } ]], ["TypedefType" , [ { "pointer" : 34, - "desugared_type" : 111 + "desugared_type" : 112 }, { "child_type" : { - "type_ptr" : 112 + "type_ptr" : 113 }, "decl_ptr" : 33 } 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 89836083d4b..e5e62bb89ab 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/dynamic_cast.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/dynamic_cast.cpp.exp @@ -3370,47 +3370,53 @@ { "pointer" : 166 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 167 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 168 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 169 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 170 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 171 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 172 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 173 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 173 + "pointer" : 174 }, { "type_ptr" : 114 @@ -3418,31 +3424,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 174 + "pointer" : 175 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 175 + "pointer" : 176 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 176 + "pointer" : 177 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 177 + "pointer" : 178 }, - 178 + 179 ]], ["PointerType" , [ { - "pointer" : 179 + "pointer" : 180 }, { "type_ptr" : 119, @@ -3451,7 +3457,7 @@ ]], ["PointerType" , [ { - "pointer" : 180 + "pointer" : 181 }, { "type_ptr" : 116, @@ -3460,7 +3466,7 @@ ]], ["PointerType" , [ { - "pointer" : 181 + "pointer" : 182 }, { "type_ptr" : 116 @@ -3468,17 +3474,17 @@ ]], ["RecordType" , [ { - "pointer" : 182 + "pointer" : 183 }, - 183 + 184 ]], ["ConstantArrayType" , [ { - "pointer" : 184 + "pointer" : 185 }, { "element_type" : { - "type_ptr" : 182 + "type_ptr" : 183 }, "stride" : 24 }, @@ -3492,7 +3498,7 @@ ]], ["PointerType" , [ { - "pointer" : 185 + "pointer" : 186 }, { "type_ptr" : 8 @@ -3518,7 +3524,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 186 + "pointer" : 187 }, { "type_ptr" : 8 @@ -3534,7 +3540,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 187 + "pointer" : 188 }, { "type_ptr" : 8, @@ -3552,17 +3558,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 188 + "pointer" : 189 }, { "return_type" : { - "type_ptr" : 186 + "type_ptr" : 187 } }, { "params_type" : [ { - "type_ptr" : 187 + "type_ptr" : 188 } ] } @@ -3586,7 +3592,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 189 + "pointer" : 190 }, { "type_ptr" : 8 @@ -3602,17 +3608,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 190 + "pointer" : 191 }, { "return_type" : { - "type_ptr" : 186 + "type_ptr" : 187 } }, { "params_type" : [ { - "type_ptr" : 189 + "type_ptr" : 190 } ] } @@ -3660,7 +3666,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 191 + "pointer" : 192 }, { "type_ptr" : 33 @@ -3676,7 +3682,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 192 + "pointer" : 193 }, { "type_ptr" : 33, @@ -3694,17 +3700,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 193 + "pointer" : 194 }, { "return_type" : { - "type_ptr" : 191 + "type_ptr" : 192 } }, { "params_type" : [ { - "type_ptr" : 192 + "type_ptr" : 193 } ] } @@ -3728,7 +3734,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 194 + "pointer" : 195 }, { "type_ptr" : 33 @@ -3744,17 +3750,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 195 + "pointer" : 196 }, { "return_type" : { - "type_ptr" : 191 + "type_ptr" : 192 } }, { "params_type" : [ { - "type_ptr" : 194 + "type_ptr" : 195 } ] } @@ -3796,7 +3802,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 196 + "pointer" : 197 }, { "return_type" : { @@ -3808,7 +3814,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 197 + "pointer" : 198 }, { "return_type" : { @@ -3818,7 +3824,7 @@ { "params_type" : [ { - "type_ptr" : 187 + "type_ptr" : 188 } ] } @@ -3842,7 +3848,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 198 + "pointer" : 199 }, { "return_type" : { @@ -3852,7 +3858,7 @@ { "params_type" : [ { - "type_ptr" : 189 + "type_ptr" : 190 } ] } @@ -3896,7 +3902,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 199 + "pointer" : 200 }, { "return_type" : { @@ -3908,7 +3914,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 200 + "pointer" : 201 }, { "return_type" : { @@ -3918,7 +3924,7 @@ { "params_type" : [ { - "type_ptr" : 192 + "type_ptr" : 193 } ] } @@ -3942,7 +3948,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 201 + "pointer" : 202 }, { "return_type" : { @@ -3952,7 +3958,7 @@ { "params_type" : [ { - "type_ptr" : 194 + "type_ptr" : 195 } ] } @@ -3976,7 +3982,7 @@ ]], ["PointerType" , [ { - "pointer" : 202 + "pointer" : 203 }, { "type_ptr" : 33 @@ -3998,7 +4004,7 @@ ]], ["PointerType" , [ { - "pointer" : 203 + "pointer" : 204 }, { "type_ptr" : 56 @@ -4014,7 +4020,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 204 + "pointer" : 205 }, { "type_ptr" : 56 @@ -4030,40 +4036,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 205 + "pointer" : 206 }, { - "base_type" : 170 + "base_type" : 171 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 206 + "pointer" : 207 }, { - "type_ptr" : 205 + "type_ptr" : 206 } ]], ["TypedefType" , [ { - "pointer" : 207, - "desugared_type" : 206 + "pointer" : 208, + "desugared_type" : 207 }, { "child_type" : { - "type_ptr" : 206 + "type_ptr" : 207 }, - "decl_ptr" : 208 + "decl_ptr" : 209 } ]], ["TypedefType" , [ { "pointer" : 113, - "desugared_type" : 206 + "desugared_type" : 207 }, { "child_type" : { - "type_ptr" : 207 + "type_ptr" : 208 }, "decl_ptr" : 112 } 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 cc229c09dc5..dd1729c1e67 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 @@ -3619,47 +3619,53 @@ { "pointer" : 166 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 167 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 168 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 169 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 170 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 171 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 172 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 173 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 173 + "pointer" : 174 }, { "type_ptr" : 115 @@ -3667,31 +3673,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 174 + "pointer" : 175 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 175 + "pointer" : 176 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 176 + "pointer" : 177 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 177 + "pointer" : 178 }, - 178 + 179 ]], ["PointerType" , [ { - "pointer" : 179 + "pointer" : 180 }, { "type_ptr" : 14, @@ -3700,7 +3706,7 @@ ]], ["PointerType" , [ { - "pointer" : 180 + "pointer" : 181 }, { "type_ptr" : 117, @@ -3709,7 +3715,7 @@ ]], ["PointerType" , [ { - "pointer" : 181 + "pointer" : 182 }, { "type_ptr" : 117 @@ -3717,17 +3723,17 @@ ]], ["RecordType" , [ { - "pointer" : 182 + "pointer" : 183 }, - 183 + 184 ]], ["ConstantArrayType" , [ { - "pointer" : 184 + "pointer" : 185 }, { "element_type" : { - "type_ptr" : 182 + "type_ptr" : 183 }, "stride" : 24 }, @@ -3741,7 +3747,7 @@ ]], ["PointerType" , [ { - "pointer" : 185 + "pointer" : 186 }, { "type_ptr" : 8 @@ -3772,7 +3778,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 186 + "pointer" : 187 }, { "type_ptr" : 8, @@ -3790,7 +3796,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 187 + "pointer" : 188 }, { "return_type" : { @@ -3800,7 +3806,7 @@ { "params_type" : [ { - "type_ptr" : 186 + "type_ptr" : 187 } ] } @@ -3824,7 +3830,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 188 + "pointer" : 189 }, { "type_ptr" : 8 @@ -3832,7 +3838,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 189 + "pointer" : 190 }, { "type_ptr" : 39 @@ -3840,17 +3846,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 190 + "pointer" : 191 }, { "return_type" : { - "type_ptr" : 188 + "type_ptr" : 189 } }, { "params_type" : [ { - "type_ptr" : 186 + "type_ptr" : 187 } ] } @@ -3861,7 +3867,7 @@ }, { "return_type" : { - "type_ptr" : 189 + "type_ptr" : 190 } }, { @@ -3886,7 +3892,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 191 + "pointer" : 192 }, { "return_type" : { @@ -3904,7 +3910,7 @@ ]], ["PointerType" , [ { - "pointer" : 192 + "pointer" : 193 }, { "type_ptr" : 25 @@ -3918,7 +3924,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 193 + "pointer" : 194 }, { "return_type" : { @@ -3930,7 +3936,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 194 + "pointer" : 195 }, { "return_type" : { @@ -3964,7 +3970,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 195 + "pointer" : 196 }, { "return_type" : { @@ -3998,7 +4004,7 @@ ]], ["PointerType" , [ { - "pointer" : 196 + "pointer" : 197 }, { "type_ptr" : 39 @@ -4018,10 +4024,10 @@ ]], ["PointerType" , [ { - "pointer" : 197 + "pointer" : 198 }, { - "type_ptr" : 194 + "type_ptr" : 195 } ]], ["PointerType" , [ @@ -4034,7 +4040,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 198 + "pointer" : 199 }, { "type_ptr" : 25, @@ -4052,7 +4058,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 199 + "pointer" : 200 }, { "return_type" : { @@ -4062,14 +4068,14 @@ { "params_type" : [ { - "type_ptr" : 198 + "type_ptr" : 199 } ] } ]], ["FunctionProtoType" , [ { - "pointer" : 200 + "pointer" : 201 }, { "return_type" : { @@ -4086,7 +4092,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 201 + "pointer" : 202 }, { "type_ptr" : 25 @@ -4094,7 +4100,7 @@ ]], ["PointerType" , [ { - "pointer" : 202 + "pointer" : 203 }, { "type_ptr" : 43 @@ -4102,10 +4108,10 @@ ]], ["PointerType" , [ { - "pointer" : 203 + "pointer" : 204 }, { - "type_ptr" : 195 + "type_ptr" : 196 } ]], ["PointerType" , [ @@ -4135,10 +4141,10 @@ ]], ["PointerType" , [ { - "pointer" : 204 + "pointer" : 205 }, { - "type_ptr" : 190 + "type_ptr" : 191 } ]], ["PointerType" , [ @@ -4151,40 +4157,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 205 + "pointer" : 206 }, { - "base_type" : 170 + "base_type" : 171 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 206 + "pointer" : 207 }, { - "type_ptr" : 205 + "type_ptr" : 206 } ]], ["TypedefType" , [ { - "pointer" : 207, - "desugared_type" : 206 + "pointer" : 208, + "desugared_type" : 207 }, { "child_type" : { - "type_ptr" : 206 + "type_ptr" : 207 }, - "decl_ptr" : 208 + "decl_ptr" : 209 } ]], ["TypedefType" , [ { "pointer" : 114, - "desugared_type" : 206 + "desugared_type" : 207 }, { "child_type" : { - "type_ptr" : 207 + "type_ptr" : 208 }, "decl_ptr" : 113 } diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/friend.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/friend.cpp.exp index bb889c9515d..c2dc2b7a08e 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/friend.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/friend.cpp.exp @@ -927,47 +927,53 @@ { "pointer" : 87 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 88 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 89 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 90 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 91 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 92 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 93 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 94 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 94 + "pointer" : 95 }, { "type_ptr" : 36 @@ -975,31 +981,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 95 + "pointer" : 96 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 96 + "pointer" : 97 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 97 + "pointer" : 98 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 98 + "pointer" : 99 }, - 99 + 100 ]], ["PointerType" , [ { - "pointer" : 100 + "pointer" : 101 }, { "type_ptr" : 30, @@ -1008,7 +1014,7 @@ ]], ["PointerType" , [ { - "pointer" : 101 + "pointer" : 102 }, { "type_ptr" : 38, @@ -1017,7 +1023,7 @@ ]], ["PointerType" , [ { - "pointer" : 102 + "pointer" : 103 }, { "type_ptr" : 38 @@ -1025,17 +1031,17 @@ ]], ["RecordType" , [ { - "pointer" : 103 + "pointer" : 104 }, - 104 + 105 ]], ["ConstantArrayType" , [ { - "pointer" : 105 + "pointer" : 106 }, { "element_type" : { - "type_ptr" : 103 + "type_ptr" : 104 }, "stride" : 24 }, @@ -1043,104 +1049,104 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 106 + "pointer" : 107 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 107 + "pointer" : 108 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 108 + "pointer" : 109 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 109 + "pointer" : 110 } ]], ["InjectedClassNameType" , [ { - "pointer" : 110 + "pointer" : 111 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 111 + "pointer" : 112 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 112 + "pointer" : 113 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 113 + "pointer" : 114 } ]], ["InjectedClassNameType" , [ { - "pointer" : 114 + "pointer" : 115 } ]], ["PointerType" , [ { - "pointer" : 115 + "pointer" : 116 }, { - "type_ptr" : 106 + "type_ptr" : 107 } ]], ["PointerType" , [ { - "pointer" : 116 + "pointer" : 117 }, { - "type_ptr" : 111 + "type_ptr" : 112 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 117 + "pointer" : 118 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 118 + "pointer" : 119 } ]], ["ElaboratedType" , [ { - "pointer" : 119, - "desugared_type" : 118 + "pointer" : 120, + "desugared_type" : 119 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 120 + "pointer" : 121 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 121 + "pointer" : 122 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 122 + "pointer" : 123 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 123 + "pointer" : 124 } ]], ["InjectedClassNameType" , [ { - "pointer" : 124 + "pointer" : 125 } ]], ["RecordType" , [ @@ -1151,7 +1157,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 125, + "pointer" : 126, "desugared_type" : 13 } ]], @@ -1163,7 +1169,7 @@ ]], ["SubstTemplateTypeParmType" , [ { - "pointer" : 126, + "pointer" : 127, "desugared_type" : 30 } ]], @@ -1177,10 +1183,10 @@ ]], ["PointerType" , [ { - "pointer" : 127 + "pointer" : 128 }, { - "type_ptr" : 126 + "type_ptr" : 127 } ]], ["RecordType" , [ @@ -1191,7 +1197,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 128, + "pointer" : 129, "desugared_type" : 9 } ]], @@ -1203,12 +1209,12 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 129 + "pointer" : 130 } ]], ["FunctionProtoType" , [ { - "pointer" : 130 + "pointer" : 131 }, { "return_type" : { @@ -1220,7 +1226,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 131 + "pointer" : 132 }, { "return_type" : { @@ -1232,13 +1238,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 132, + "pointer" : 133, "desugared_type" : 13 } ]], ["LValueReferenceType" , [ { - "pointer" : 133 + "pointer" : 134 }, { "type_ptr" : 13, @@ -1250,13 +1256,13 @@ "pointer" : 25 }, { - "type_ptr" : 132, + "type_ptr" : 133, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 134 + "pointer" : 135 }, { "return_type" : { @@ -1266,7 +1272,7 @@ { "params_type" : [ { - "type_ptr" : 133 + "type_ptr" : 134 } ] } @@ -1290,7 +1296,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 135 + "pointer" : 136 }, { "type_ptr" : 13 @@ -1301,12 +1307,12 @@ "pointer" : 29 }, { - "type_ptr" : 132 + "type_ptr" : 133 } ]], ["FunctionProtoType" , [ { - "pointer" : 136 + "pointer" : 137 }, { "return_type" : { @@ -1316,7 +1322,7 @@ { "params_type" : [ { - "type_ptr" : 135 + "type_ptr" : 136 } ] } @@ -1352,7 +1358,7 @@ ]], ["PointerType" , [ { - "pointer" : 137 + "pointer" : 138 }, { "type_ptr" : 13 @@ -1360,7 +1366,7 @@ ]], ["PointerType" , [ { - "pointer" : 138 + "pointer" : 139 }, { "type_ptr" : 32 @@ -1368,7 +1374,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 139 + "pointer" : 140 }, { "type_ptr" : 13 @@ -1376,40 +1382,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 140 + "pointer" : 141 }, { - "base_type" : 91 + "base_type" : 92 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 141 + "pointer" : 142 }, { - "type_ptr" : 140 + "type_ptr" : 141 } ]], ["TypedefType" , [ { - "pointer" : 142, - "desugared_type" : 141 + "pointer" : 143, + "desugared_type" : 142 }, { "child_type" : { - "type_ptr" : 141 + "type_ptr" : 142 }, - "decl_ptr" : 143 + "decl_ptr" : 144 } ]], ["TypedefType" , [ { "pointer" : 35, - "desugared_type" : 141 + "desugared_type" : 142 }, { "child_type" : { - "type_ptr" : 142 + "type_ptr" : 143 }, "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 44c6b96f294..cabb95878c5 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/function_template.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/function_template.cpp.exp @@ -1717,47 +1717,53 @@ { "pointer" : 118 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 119 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 120 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 121 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 122 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 123 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 124 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 125 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 125 + "pointer" : 126 }, { "type_ptr" : 70 @@ -1765,31 +1771,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 126 + "pointer" : 127 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 127 + "pointer" : 128 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 128 + "pointer" : 129 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 129 + "pointer" : 130 }, - 130 + 131 ]], ["PointerType" , [ { - "pointer" : 131 + "pointer" : 132 }, { "type_ptr" : 38, @@ -1798,7 +1804,7 @@ ]], ["PointerType" , [ { - "pointer" : 132 + "pointer" : 133 }, { "type_ptr" : 25, @@ -1807,7 +1813,7 @@ ]], ["PointerType" , [ { - "pointer" : 133 + "pointer" : 134 }, { "type_ptr" : 25 @@ -1815,17 +1821,17 @@ ]], ["RecordType" , [ { - "pointer" : 134 + "pointer" : 135 }, - 135 + 136 ]], ["ConstantArrayType" , [ { - "pointer" : 136 + "pointer" : 137 }, { "element_type" : { - "type_ptr" : 134 + "type_ptr" : 135 }, "stride" : 24 }, @@ -1833,44 +1839,44 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 137 + "pointer" : 138 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 138 + "pointer" : 139 } ]], ["FunctionProtoType" , [ { - "pointer" : 139 + "pointer" : 140 }, { "return_type" : { - "type_ptr" : 137 + "type_ptr" : 138 } }, { "params_type" : [ { - "type_ptr" : 137 + "type_ptr" : 138 } ] } ]], ["FunctionProtoType" , [ { - "pointer" : 140 + "pointer" : 141 }, { "return_type" : { - "type_ptr" : 138 + "type_ptr" : 139 } }, { "params_type" : [ { - "type_ptr" : 138 + "type_ptr" : 139 } ] } @@ -1894,30 +1900,30 @@ ]], ["SubstTemplateTypeParmType" , [ { - "pointer" : 141, + "pointer" : 142, "desugared_type" : 38 } ]], ["FunctionProtoType" , [ { - "pointer" : 142 + "pointer" : 143 }, { "return_type" : { - "type_ptr" : 141 + "type_ptr" : 142 } }, { "params_type" : [ { - "type_ptr" : 141 + "type_ptr" : 142 } ] } ]], ["FunctionProtoType" , [ { - "pointer" : 143 + "pointer" : 144 }, { "return_type" : { @@ -1975,7 +1981,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 144 + "pointer" : 145 }, { "return_type" : { @@ -2009,10 +2015,10 @@ ]], ["PointerType" , [ { - "pointer" : 145 + "pointer" : 146 }, { - "type_ptr" : 144 + "type_ptr" : 145 } ]], ["PointerType" , [ @@ -2031,7 +2037,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 146 + "pointer" : 147 }, { "return_type" : { @@ -2065,10 +2071,10 @@ ]], ["PointerType" , [ { - "pointer" : 147 + "pointer" : 148 }, { - "type_ptr" : 146 + "type_ptr" : 147 } ]], ["PointerType" , [ @@ -2081,40 +2087,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 148 + "pointer" : 149 }, { - "base_type" : 122 + "base_type" : 123 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 149 + "pointer" : 150 }, { - "type_ptr" : 148 + "type_ptr" : 149 } ]], ["TypedefType" , [ { - "pointer" : 150, - "desugared_type" : 149 + "pointer" : 151, + "desugared_type" : 150 }, { "child_type" : { - "type_ptr" : 149 + "type_ptr" : 150 }, - "decl_ptr" : 151 + "decl_ptr" : 152 } ]], ["TypedefType" , [ { "pointer" : 69, - "desugared_type" : 149 + "desugared_type" : 150 }, { "child_type" : { - "type_ptr" : 150 + "type_ptr" : 151 }, "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 188f3195550..849f04fe282 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheritance.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheritance.cpp.exp @@ -2919,47 +2919,53 @@ { "pointer" : 176 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 177 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 178 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 179 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 180 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 181 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 182 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 183 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 183 + "pointer" : 184 }, { "type_ptr" : 103 @@ -2967,31 +2973,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 184 + "pointer" : 185 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 185 + "pointer" : 186 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 186 + "pointer" : 187 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 187 + "pointer" : 188 }, - 188 + 189 ]], ["PointerType" , [ { - "pointer" : 189 + "pointer" : 190 }, { "type_ptr" : 22, @@ -3000,7 +3006,7 @@ ]], ["PointerType" , [ { - "pointer" : 190 + "pointer" : 191 }, { "type_ptr" : 129, @@ -3009,7 +3015,7 @@ ]], ["PointerType" , [ { - "pointer" : 191 + "pointer" : 192 }, { "type_ptr" : 129 @@ -3017,17 +3023,17 @@ ]], ["RecordType" , [ { - "pointer" : 192 + "pointer" : 193 }, - 193 + 194 ]], ["ConstantArrayType" , [ { - "pointer" : 194 + "pointer" : 195 }, { "element_type" : { - "type_ptr" : 192 + "type_ptr" : 193 }, "stride" : 24 }, @@ -3133,7 +3139,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 195 + "pointer" : 196 }, { "type_ptr" : 16 @@ -3141,7 +3147,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 196 + "pointer" : 197 }, { "type_ptr" : 126 @@ -3149,7 +3155,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 197 + "pointer" : 198 }, { "type_ptr" : 16, @@ -3167,17 +3173,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 198 + "pointer" : 199 }, { "return_type" : { - "type_ptr" : 195 + "type_ptr" : 196 } }, { "params_type" : [ { - "type_ptr" : 197 + "type_ptr" : 198 } ] } @@ -3188,7 +3194,7 @@ }, { "return_type" : { - "type_ptr" : 196 + "type_ptr" : 197 } }, { @@ -3201,7 +3207,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 199 + "pointer" : 200 }, { "type_ptr" : 16 @@ -3217,17 +3223,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 200 + "pointer" : 201 }, { "return_type" : { - "type_ptr" : 195 + "type_ptr" : 196 } }, { "params_type" : [ { - "type_ptr" : 199 + "type_ptr" : 200 } ] } @@ -3238,7 +3244,7 @@ }, { "return_type" : { - "type_ptr" : 196 + "type_ptr" : 197 } }, { @@ -3277,7 +3283,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 201 + "pointer" : 202 }, { "type_ptr" : 54 @@ -3297,21 +3303,21 @@ ]], ["ElaboratedType" , [ { - "pointer" : 202, + "pointer" : 203, "desugared_type" : 54 } ]], ["LValueReferenceType" , [ { - "pointer" : 203 + "pointer" : 204 }, { - "type_ptr" : 202 + "type_ptr" : 203 } ]], ["LValueReferenceType" , [ { - "pointer" : 204 + "pointer" : 205 }, { "type_ptr" : 54, @@ -3323,23 +3329,23 @@ "pointer" : 119 }, { - "type_ptr" : 202, + "type_ptr" : 203, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 205 + "pointer" : 206 }, { "return_type" : { - "type_ptr" : 201 + "type_ptr" : 202 } }, { "params_type" : [ { - "type_ptr" : 204 + "type_ptr" : 205 } ] } @@ -3350,7 +3356,7 @@ }, { "return_type" : { - "type_ptr" : 203 + "type_ptr" : 204 } }, { @@ -3363,7 +3369,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 206 + "pointer" : 207 }, { "type_ptr" : 54 @@ -3374,22 +3380,22 @@ "pointer" : 123 }, { - "type_ptr" : 202 + "type_ptr" : 203 } ]], ["FunctionProtoType" , [ { - "pointer" : 207 + "pointer" : 208 }, { "return_type" : { - "type_ptr" : 201 + "type_ptr" : 202 } }, { "params_type" : [ { - "type_ptr" : 206 + "type_ptr" : 207 } ] } @@ -3400,7 +3406,7 @@ }, { "return_type" : { - "type_ptr" : 203 + "type_ptr" : 204 } }, { @@ -3441,40 +3447,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 208 + "pointer" : 209 }, { - "base_type" : 180 + "base_type" : 181 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 209 + "pointer" : 210 }, { - "type_ptr" : 208 + "type_ptr" : 209 } ]], ["TypedefType" , [ { - "pointer" : 210, - "desugared_type" : 209 + "pointer" : 211, + "desugared_type" : 210 }, { "child_type" : { - "type_ptr" : 209 + "type_ptr" : 210 }, - "decl_ptr" : 211 + "decl_ptr" : 212 } ]], ["TypedefType" , [ { "pointer" : 128, - "desugared_type" : 209 + "desugared_type" : 210 }, { "child_type" : { - "type_ptr" : 210 + "type_ptr" : 211 }, "decl_ptr" : 127 } 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 94f80a95903..ea2cf18dd7e 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheriting_constructor.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/inheriting_constructor.cpp.exp @@ -1463,47 +1463,53 @@ { "pointer" : 112 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 113 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 114 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 115 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 116 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 117 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 118 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 119 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 119 + "pointer" : 120 }, { "type_ptr" : 61 @@ -1511,31 +1517,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 120 + "pointer" : 121 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 121 + "pointer" : 122 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 122 + "pointer" : 123 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 123 + "pointer" : 124 }, - 124 + 125 ]], ["PointerType" , [ { - "pointer" : 125 + "pointer" : 126 }, { "type_ptr" : 13, @@ -1544,7 +1550,7 @@ ]], ["PointerType" , [ { - "pointer" : 126 + "pointer" : 127 }, { "type_ptr" : 63, @@ -1553,7 +1559,7 @@ ]], ["PointerType" , [ { - "pointer" : 127 + "pointer" : 128 }, { "type_ptr" : 63 @@ -1561,17 +1567,17 @@ ]], ["RecordType" , [ { - "pointer" : 128 + "pointer" : 129 }, - 129 + 130 ]], ["ConstantArrayType" , [ { - "pointer" : 130 + "pointer" : 131 }, { "element_type" : { - "type_ptr" : 128 + "type_ptr" : 129 }, "stride" : 24 }, @@ -1585,7 +1591,7 @@ ]], ["PointerType" , [ { - "pointer" : 131 + "pointer" : 132 }, { "type_ptr" : 8 @@ -1634,7 +1640,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 132 + "pointer" : 133 }, { "type_ptr" : 8, @@ -1652,7 +1658,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 133 + "pointer" : 134 }, { "return_type" : { @@ -1662,7 +1668,7 @@ { "params_type" : [ { - "type_ptr" : 132 + "type_ptr" : 133 } ] } @@ -1686,7 +1692,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 134 + "pointer" : 135 }, { "type_ptr" : 8 @@ -1702,7 +1708,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 135 + "pointer" : 136 }, { "return_type" : { @@ -1712,7 +1718,7 @@ { "params_type" : [ { - "type_ptr" : 134 + "type_ptr" : 135 } ] } @@ -1754,7 +1760,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 136 + "pointer" : 137 }, { "type_ptr" : 29, @@ -1772,7 +1778,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 137 + "pointer" : 138 }, { "return_type" : { @@ -1782,7 +1788,7 @@ { "params_type" : [ { - "type_ptr" : 136 + "type_ptr" : 137 } ] } @@ -1818,7 +1824,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 138 + "pointer" : 139 }, { "type_ptr" : 29 @@ -1834,7 +1840,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 139 + "pointer" : 140 }, { "return_type" : { @@ -1844,7 +1850,7 @@ { "params_type" : [ { - "type_ptr" : 138 + "type_ptr" : 139 } ] } @@ -1880,15 +1886,15 @@ ]], ["PointerType" , [ { - "pointer" : 140 + "pointer" : 141 }, { - "type_ptr" : 127 + "type_ptr" : 128 } ]], ["LValueReferenceType" , [ { - "pointer" : 141 + "pointer" : 142 }, { "type_ptr" : 8 @@ -1896,7 +1902,7 @@ ]], ["PointerType" , [ { - "pointer" : 142 + "pointer" : 143 }, { "type_ptr" : 29 @@ -1904,7 +1910,7 @@ ]], ["PointerType" , [ { - "pointer" : 143 + "pointer" : 144 }, { "type_ptr" : 57 @@ -1912,7 +1918,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 144 + "pointer" : 145 }, { "return_type" : { @@ -1946,40 +1952,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 145 + "pointer" : 146 }, { - "base_type" : 116 + "base_type" : 117 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 146 + "pointer" : 147 }, { - "type_ptr" : 145 + "type_ptr" : 146 } ]], ["TypedefType" , [ { - "pointer" : 147, - "desugared_type" : 146 + "pointer" : 148, + "desugared_type" : 147 }, { "child_type" : { - "type_ptr" : 146 + "type_ptr" : 147 }, - "decl_ptr" : 148 + "decl_ptr" : 149 } ]], ["TypedefType" , [ { "pointer" : 60, - "desugared_type" : 146 + "desugared_type" : 147 }, { "child_type" : { - "type_ptr" : 147 + "type_ptr" : 148 }, "decl_ptr" : 59 } diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/lambda.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/lambda.cpp.exp index 2ce7637be3c..89166c8ebf1 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/lambda.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/lambda.cpp.exp @@ -5662,47 +5662,53 @@ { "pointer" : 172 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 173 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 174 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 175 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 176 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 177 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 178 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 179 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 179 + "pointer" : 180 }, { "type_ptr" : 121 @@ -5710,31 +5716,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 180 + "pointer" : 181 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 181 + "pointer" : 182 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 182 + "pointer" : 183 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 183 + "pointer" : 184 }, - 184 + 185 ]], ["PointerType" , [ { - "pointer" : 185 + "pointer" : 186 }, { "type_ptr" : 12, @@ -5743,7 +5749,7 @@ ]], ["PointerType" , [ { - "pointer" : 186 + "pointer" : 187 }, { "type_ptr" : 123, @@ -5752,7 +5758,7 @@ ]], ["PointerType" , [ { - "pointer" : 187 + "pointer" : 188 }, { "type_ptr" : 123 @@ -5760,17 +5766,17 @@ ]], ["RecordType" , [ { - "pointer" : 188 + "pointer" : 189 }, - 189 + 190 ]], ["ConstantArrayType" , [ { - "pointer" : 190 + "pointer" : 191 }, { "element_type" : { - "type_ptr" : 188 + "type_ptr" : 189 }, "stride" : 24 }, @@ -5790,10 +5796,10 @@ ]], ["PointerType" , [ { - "pointer" : 191 + "pointer" : 192 }, { - "type_ptr" : 187 + "type_ptr" : 188 } ]], ["RecordType" , [ @@ -5804,11 +5810,11 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 192 + "pointer" : 193 }, { "return_type" : { - "type_ptr" : 193 + "type_ptr" : 194 } }, { @@ -5816,18 +5822,18 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 194 + "pointer" : 195 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 195 + "pointer" : 196 } ]], ["AutoType" , [ { - "pointer" : 196, - "desugared_type" : 195 + "pointer" : 197, + "desugared_type" : 196 } ]], ["AutoType" , [ @@ -5838,7 +5844,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 197 + "pointer" : 198 }, { "return_type" : { @@ -5874,7 +5880,7 @@ ]], ["PointerType" , [ { - "pointer" : 198 + "pointer" : 199 }, { "type_ptr" : 8 @@ -5882,7 +5888,7 @@ ]], ["PointerType" , [ { - "pointer" : 199 + "pointer" : 200 }, { "type_ptr" : 29 @@ -5890,11 +5896,11 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 200 + "pointer" : 201 }, { "return_type" : { - "type_ptr" : 198 + "type_ptr" : 199 } }, { @@ -5906,7 +5912,7 @@ }, { "return_type" : { - "type_ptr" : 199 + "type_ptr" : 200 } }, { @@ -5914,7 +5920,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 201 + "pointer" : 202 }, { "return_type" : { @@ -5926,7 +5932,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 202 + "pointer" : 203 }, { "return_type" : { @@ -5950,13 +5956,13 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 203 + "pointer" : 204 } ]], ["AutoType" , [ { - "pointer" : 204, - "desugared_type" : 203 + "pointer" : 205, + "desugared_type" : 204 } ]], ["AutoType" , [ @@ -5967,13 +5973,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 205, + "pointer" : 206, "desugared_type" : 22 } ]], ["LValueReferenceType" , [ { - "pointer" : 206 + "pointer" : 207 }, { "type_ptr" : 22, @@ -5985,13 +5991,13 @@ "pointer" : 35 }, { - "type_ptr" : 205, + "type_ptr" : 206, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 207 + "pointer" : 208 }, { "return_type" : { @@ -6001,7 +6007,7 @@ { "params_type" : [ { - "type_ptr" : 206 + "type_ptr" : 207 } ] } @@ -6025,7 +6031,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 208 + "pointer" : 209 }, { "type_ptr" : 22 @@ -6036,12 +6042,12 @@ "pointer" : 39 }, { - "type_ptr" : 205 + "type_ptr" : 206 } ]], ["FunctionProtoType" , [ { - "pointer" : 209 + "pointer" : 210 }, { "return_type" : { @@ -6051,14 +6057,14 @@ { "params_type" : [ { - "type_ptr" : 208 + "type_ptr" : 209 } ] } ]], ["FunctionProtoType" , [ { - "pointer" : 210 + "pointer" : 211 }, { "return_type" : { @@ -6075,7 +6081,7 @@ ]], ["PointerType" , [ { - "pointer" : 211 + "pointer" : 212 }, { "type_ptr" : 22 @@ -6083,7 +6089,7 @@ ]], ["PointerType" , [ { - "pointer" : 212 + "pointer" : 213 }, { "type_ptr" : 41 @@ -6091,7 +6097,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 213 + "pointer" : 214 }, { "type_ptr" : 22 @@ -6130,11 +6136,11 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 214 + "pointer" : 215 }, { "return_type" : { - "type_ptr" : 193 + "type_ptr" : 194 } }, { @@ -6147,18 +6153,18 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 215 + "pointer" : 216 } ]], ["AutoType" , [ { - "pointer" : 216, - "desugared_type" : 215 + "pointer" : 217, + "desugared_type" : 216 } ]], ["FunctionProtoType" , [ { - "pointer" : 217 + "pointer" : 218 }, { "return_type" : { @@ -6192,7 +6198,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 218 + "pointer" : 219 }, { "return_type" : { @@ -6204,13 +6210,13 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 219 + "pointer" : 220 } ]], ["AutoType" , [ { - "pointer" : 220, - "desugared_type" : 219 + "pointer" : 221, + "desugared_type" : 220 } ]], ["AutoType" , [ @@ -6227,7 +6233,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 221 + "pointer" : 222 }, { "type_ptr" : 55, @@ -6245,7 +6251,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 222 + "pointer" : 223 }, { "return_type" : { @@ -6255,7 +6261,7 @@ { "params_type" : [ { - "type_ptr" : 221 + "type_ptr" : 222 } ] } @@ -6279,7 +6285,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 223 + "pointer" : 224 }, { "type_ptr" : 55 @@ -6295,7 +6301,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 224 + "pointer" : 225 }, { "return_type" : { @@ -6305,14 +6311,14 @@ { "params_type" : [ { - "type_ptr" : 223 + "type_ptr" : 224 } ] } ]], ["FunctionProtoType" , [ { - "pointer" : 225 + "pointer" : 226 }, { "return_type" : { @@ -6329,7 +6335,7 @@ ]], ["PointerType" , [ { - "pointer" : 226 + "pointer" : 227 }, { "type_ptr" : 55 @@ -6337,7 +6343,7 @@ ]], ["PointerType" , [ { - "pointer" : 227 + "pointer" : 228 }, { "type_ptr" : 81 @@ -6345,7 +6351,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 228 + "pointer" : 229 }, { "type_ptr" : 55 @@ -6370,13 +6376,13 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 229 + "pointer" : 230 } ]], ["AutoType" , [ { - "pointer" : 230, - "desugared_type" : 229 + "pointer" : 231, + "desugared_type" : 230 } ]], ["RecordType" , [ @@ -6387,18 +6393,18 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 231 + "pointer" : 232 } ]], ["AutoType" , [ { - "pointer" : 232, - "desugared_type" : 231 + "pointer" : 233, + "desugared_type" : 232 } ]], ["AutoType" , [ { - "pointer" : 233, + "pointer" : 234, "desugared_type" : 12 } ]], @@ -6408,7 +6414,7 @@ }, { "return_type" : { - "type_ptr" : 233 + "type_ptr" : 234 } }, { @@ -6416,7 +6422,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 234 + "pointer" : 235 }, { "return_type" : { @@ -6428,13 +6434,13 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 235 + "pointer" : 236 } ]], ["AutoType" , [ { - "pointer" : 236, - "desugared_type" : 235 + "pointer" : 237, + "desugared_type" : 236 } ]], ["AutoType" , [ @@ -6451,7 +6457,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 237 + "pointer" : 238 }, { "type_ptr" : 95, @@ -6469,7 +6475,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 238 + "pointer" : 239 }, { "return_type" : { @@ -6479,7 +6485,7 @@ { "params_type" : [ { - "type_ptr" : 237 + "type_ptr" : 238 } ] } @@ -6503,7 +6509,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 239 + "pointer" : 240 }, { "type_ptr" : 95 @@ -6519,7 +6525,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 240 + "pointer" : 241 }, { "return_type" : { @@ -6529,14 +6535,14 @@ { "params_type" : [ { - "type_ptr" : 239 + "type_ptr" : 240 } ] } ]], ["FunctionProtoType" , [ { - "pointer" : 241 + "pointer" : 242 }, { "return_type" : { @@ -6553,7 +6559,7 @@ ]], ["PointerType" , [ { - "pointer" : 242 + "pointer" : 243 }, { "type_ptr" : 95 @@ -6561,7 +6567,7 @@ ]], ["PointerType" , [ { - "pointer" : 243 + "pointer" : 244 }, { "type_ptr" : 115 @@ -6569,7 +6575,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 244 + "pointer" : 245 }, { "type_ptr" : 95 @@ -6594,40 +6600,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 245 + "pointer" : 246 }, { - "base_type" : 176 + "base_type" : 177 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 246 + "pointer" : 247 }, { - "type_ptr" : 245 + "type_ptr" : 246 } ]], ["TypedefType" , [ { - "pointer" : 247, - "desugared_type" : 246 + "pointer" : 248, + "desugared_type" : 247 }, { "child_type" : { - "type_ptr" : 246 + "type_ptr" : 247 }, - "decl_ptr" : 248 + "decl_ptr" : 249 } ]], ["TypedefType" , [ { "pointer" : 120, - "desugared_type" : 246 + "desugared_type" : 247 }, { "child_type" : { - "type_ptr" : 247 + "type_ptr" : 248 }, "decl_ptr" : 119 } 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 bf9bf8ee581..8224973a86f 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/materialize_temporary.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/materialize_temporary.cpp.exp @@ -594,47 +594,53 @@ { "pointer" : 67 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 68 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 69 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 70 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 71 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 72 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 73 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 74 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 74 + "pointer" : 75 }, { "type_ptr" : 17 @@ -642,31 +648,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 75 + "pointer" : 76 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 76 + "pointer" : 77 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 77 + "pointer" : 78 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 78 + "pointer" : 79 }, - 79 + 80 ]], ["PointerType" , [ { - "pointer" : 80 + "pointer" : 81 }, { "type_ptr" : 14, @@ -675,7 +681,7 @@ ]], ["PointerType" , [ { - "pointer" : 81 + "pointer" : 82 }, { "type_ptr" : 19, @@ -684,7 +690,7 @@ ]], ["PointerType" , [ { - "pointer" : 82 + "pointer" : 83 }, { "type_ptr" : 19 @@ -692,17 +698,17 @@ ]], ["RecordType" , [ { - "pointer" : 83 + "pointer" : 84 }, - 84 + 85 ]], ["ConstantArrayType" , [ { - "pointer" : 85 + "pointer" : 86 }, { "element_type" : { - "type_ptr" : 83 + "type_ptr" : 84 }, "stride" : 24 }, @@ -719,40 +725,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 86 + "pointer" : 87 }, { - "base_type" : 71 + "base_type" : 72 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 87 + "pointer" : 88 }, { - "type_ptr" : 86 + "type_ptr" : 87 } ]], ["TypedefType" , [ { - "pointer" : 88, - "desugared_type" : 87 + "pointer" : 89, + "desugared_type" : 88 }, { "child_type" : { - "type_ptr" : 87 + "type_ptr" : 88 }, - "decl_ptr" : 89 + "decl_ptr" : 90 } ]], ["TypedefType" , [ { "pointer" : 16, - "desugared_type" : 87 + "desugared_type" : 88 }, { "child_type" : { - "type_ptr" : 88 + "type_ptr" : 89 }, "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 718dbfb0924..79e95be51ec 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/namespace_decl.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/namespace_decl.cpp.exp @@ -190,17 +190,6 @@ { }, { - "original_namespace" : { - "kind" : "Namespace", - "decl_pointer" : 8, - "name" : { - "name" : "V", - "qual_name" : [ - "V", - "Q" - ] - } - } } ]], ["NamespaceDecl" , [ @@ -681,47 +670,53 @@ { "pointer" : 68 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 69 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 70 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 71 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 72 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 73 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 74 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 75 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 75 + "pointer" : 76 }, { "type_ptr" : 17 @@ -729,31 +724,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 76 + "pointer" : 77 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 77 + "pointer" : 78 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 78 + "pointer" : 79 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 79 + "pointer" : 80 }, - 80 + 81 ]], ["PointerType" , [ { - "pointer" : 81 + "pointer" : 82 }, { "type_ptr" : 12, @@ -762,7 +757,7 @@ ]], ["PointerType" , [ { - "pointer" : 82 + "pointer" : 83 }, { "type_ptr" : 19, @@ -771,7 +766,7 @@ ]], ["PointerType" , [ { - "pointer" : 83 + "pointer" : 84 }, { "type_ptr" : 19 @@ -779,17 +774,17 @@ ]], ["RecordType" , [ { - "pointer" : 84 + "pointer" : 85 }, - 85 + 86 ]], ["ConstantArrayType" , [ { - "pointer" : 86 + "pointer" : 87 }, { "element_type" : { - "type_ptr" : 84 + "type_ptr" : 85 }, "stride" : 24 }, @@ -797,40 +792,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 87 + "pointer" : 88 }, { - "base_type" : 72 + "base_type" : 73 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 88 + "pointer" : 89 }, { - "type_ptr" : 87 + "type_ptr" : 88 } ]], ["TypedefType" , [ { - "pointer" : 89, - "desugared_type" : 88 + "pointer" : 90, + "desugared_type" : 89 }, { "child_type" : { - "type_ptr" : 88 + "type_ptr" : 89 }, - "decl_ptr" : 90 + "decl_ptr" : 91 } ]], ["TypedefType" , [ { "pointer" : 16, - "desugared_type" : 88 + "desugared_type" : 89 }, { "child_type" : { - "type_ptr" : 89 + "type_ptr" : 90 }, "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 f32284da159..8f47aa7559b 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/new.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/new.cpp.exp @@ -3293,8 +3293,6 @@ } ], "is_implicit" : true, - "is_used" : true, - "is_this_declaration_referenced" : true, "attributes" : [ ["VisibilityAttr" , [ { @@ -3378,6 +3376,99 @@ ]] ] }, + { + "name" : "operator delete", + "qual_name" : [ + "operator delete" + ] + }, + { + "type_ptr" : 139 + }, + { + "mangled_name" : "4859567291822092785", + "is_cpp" : true, + "parameters" : [ + ["ParmVarDecl" , [ + { + "pointer" : 140, + "parent_pointer" : 137, + "source_range" : [ + { + }, + { + } + ], + "is_implicit" : true + }, + { + "name" : "", + "qual_name" : [ + "" + ] + }, + { + "type_ptr" : 136 + }, + { + "parm_index_in_function" : 0 + } + ]], + ["ParmVarDecl" , [ + { + "pointer" : 141, + "parent_pointer" : 137, + "source_range" : [ + { + }, + { + } + ], + "is_implicit" : true + }, + { + "name" : "", + "qual_name" : [ + "" + ] + }, + { + "type_ptr" : 68 + }, + { + "parm_index_in_function" : 0 + } + ]] + ] + } + ]], + ["FunctionDecl" , [ + { + "pointer" : 142, + "source_range" : [ + { + }, + { + } + ], + "is_implicit" : true, + "is_used" : true, + "is_this_declaration_referenced" : true, + "attributes" : [ + ["VisibilityAttr" , [ + { + "pointer" : 143, + "source_range" : [ + { + }, + { + } + ] + }, + "DefaultVisibility" + ]] + ] + }, { "name" : "operator delete[]", "qual_name" : [ @@ -3393,8 +3484,8 @@ "parameters" : [ ["ParmVarDecl" , [ { - "pointer" : 139, - "parent_pointer" : 137, + "pointer" : 144, + "parent_pointer" : 142, "source_range" : [ { }, @@ -3421,7 +3512,100 @@ ]], ["FunctionDecl" , [ { - "pointer" : 140, + "pointer" : 145, + "source_range" : [ + { + }, + { + } + ], + "is_implicit" : true, + "is_used" : true, + "is_this_declaration_referenced" : true, + "attributes" : [ + ["VisibilityAttr" , [ + { + "pointer" : 146, + "source_range" : [ + { + }, + { + } + ] + }, + "DefaultVisibility" + ]] + ] + }, + { + "name" : "operator delete[]", + "qual_name" : [ + "operator delete[]" + ] + }, + { + "type_ptr" : 139 + }, + { + "mangled_name" : "7257393423842453000", + "is_cpp" : true, + "parameters" : [ + ["ParmVarDecl" , [ + { + "pointer" : 147, + "parent_pointer" : 145, + "source_range" : [ + { + }, + { + } + ], + "is_implicit" : true + }, + { + "name" : "", + "qual_name" : [ + "" + ] + }, + { + "type_ptr" : 136 + }, + { + "parm_index_in_function" : 0 + } + ]], + ["ParmVarDecl" , [ + { + "pointer" : 148, + "parent_pointer" : 145, + "source_range" : [ + { + }, + { + } + ], + "is_implicit" : true + }, + { + "name" : "", + "qual_name" : [ + "" + ] + }, + { + "type_ptr" : 68 + }, + { + "parm_index_in_function" : 0 + } + ]] + ] + } + ]], + ["FunctionDecl" , [ + { + "pointer" : 149, "source_range" : [ { "line" : 38, @@ -3445,10 +3629,10 @@ { "mangled_name" : "6095890702841955930", "is_cpp" : true, - "decl_ptr_with_body" : 140, + "decl_ptr_with_body" : 149, "body" : ["CompoundStmt" , [ { - "pointer" : 141, + "pointer" : 150, "source_range" : [ { "line" : 38, @@ -3463,7 +3647,7 @@ [ ["DeclStmt" , [ { - "pointer" : 142, + "pointer" : 151, "source_range" : [ { "line" : 39, @@ -3477,7 +3661,7 @@ [ ["CXXNewExpr" , [ { - "pointer" : 143, + "pointer" : 152, "source_range" : [ { "column" : 13 @@ -3490,7 +3674,7 @@ [ ["ImplicitCastExpr" , [ { - "pointer" : 144, + "pointer" : 153, "source_range" : [ { "column" : 21 @@ -3502,7 +3686,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 145, + "pointer" : 154, "source_range" : [ { }, @@ -3538,7 +3722,7 @@ ]], ["InitListExpr" , [ { - "pointer" : 146, + "pointer" : 155, "source_range" : [ { "column" : 23 @@ -3551,7 +3735,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 147, + "pointer" : 156, "source_range" : [ { "column" : 24 @@ -3575,7 +3759,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 148, + "pointer" : 157, "source_range" : [ { "column" : 27 @@ -3599,7 +3783,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 149, + "pointer" : 158, "source_range" : [ { "column" : 30 @@ -3624,7 +3808,7 @@ ], { "qual_type" : { - "type_ptr" : 150 + "type_ptr" : 159 } } ]] @@ -3636,15 +3820,15 @@ }, { "is_array" : true, - "array_size_expr" : 144, - "initializer_expr" : 146 + "array_size_expr" : 153, + "initializer_expr" : 155 } ]] ], [ ["VarDecl" , [ { - "pointer" : 151, + "pointer" : 160, "source_range" : [ { "column" : 3 @@ -3666,7 +3850,7 @@ { "init_expr" : ["CXXNewExpr" , [ { - "pointer" : 143, + "pointer" : 152, "source_range" : [ { "column" : 13 @@ -3679,7 +3863,7 @@ [ ["ImplicitCastExpr" , [ { - "pointer" : 144, + "pointer" : 153, "source_range" : [ { "column" : 21 @@ -3691,7 +3875,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 145, + "pointer" : 154, "source_range" : [ { }, @@ -3727,7 +3911,7 @@ ]], ["InitListExpr" , [ { - "pointer" : 146, + "pointer" : 155, "source_range" : [ { "column" : 23 @@ -3740,7 +3924,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 147, + "pointer" : 156, "source_range" : [ { "column" : 24 @@ -3764,7 +3948,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 148, + "pointer" : 157, "source_range" : [ { "column" : 27 @@ -3788,7 +3972,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 149, + "pointer" : 158, "source_range" : [ { "column" : 30 @@ -3813,7 +3997,7 @@ ], { "qual_type" : { - "type_ptr" : 150 + "type_ptr" : 159 } } ]] @@ -3825,8 +4009,8 @@ }, { "is_array" : true, - "array_size_expr" : 144, - "initializer_expr" : 146 + "array_size_expr" : 153, + "initializer_expr" : 155 } ]] } @@ -3835,7 +4019,7 @@ ]], ["DeclStmt" , [ { - "pointer" : 152, + "pointer" : 161, "source_range" : [ { "line" : 40, @@ -3849,7 +4033,7 @@ [ ["CXXNewExpr" , [ { - "pointer" : 153, + "pointer" : 162, "source_range" : [ { "column" : 13 @@ -3862,7 +4046,7 @@ [ ["CXXConstructExpr" , [ { - "pointer" : 154, + "pointer" : 163, "source_range" : [ { "column" : 17 @@ -3875,7 +4059,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 155, + "pointer" : 164, "source_range" : [ { "column" : 25 @@ -3899,7 +4083,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 156, + "pointer" : 165, "source_range" : [ { "column" : 28 @@ -3951,14 +4135,14 @@ } }, { - "initializer_expr" : 154 + "initializer_expr" : 163 } ]] ], [ ["VarDecl" , [ { - "pointer" : 157, + "pointer" : 166, "source_range" : [ { "column" : 3 @@ -3980,7 +4164,7 @@ { "init_expr" : ["CXXNewExpr" , [ { - "pointer" : 153, + "pointer" : 162, "source_range" : [ { "column" : 13 @@ -3993,7 +4177,7 @@ [ ["CXXConstructExpr" , [ { - "pointer" : 154, + "pointer" : 163, "source_range" : [ { "column" : 17 @@ -4006,7 +4190,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 155, + "pointer" : 164, "source_range" : [ { "column" : 25 @@ -4030,7 +4214,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 156, + "pointer" : 165, "source_range" : [ { "column" : 28 @@ -4082,7 +4266,7 @@ } }, { - "initializer_expr" : 154 + "initializer_expr" : 163 } ]] } @@ -4091,7 +4275,7 @@ ]], ["DeclStmt" , [ { - "pointer" : 158, + "pointer" : 167, "source_range" : [ { "line" : 41, @@ -4105,7 +4289,7 @@ [ ["CXXNewExpr" , [ { - "pointer" : 159, + "pointer" : 168, "source_range" : [ { "column" : 15 @@ -4118,7 +4302,7 @@ [ ["ImplicitCastExpr" , [ { - "pointer" : 160, + "pointer" : 169, "source_range" : [ { "column" : 27 @@ -4130,7 +4314,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 161, + "pointer" : 170, "source_range" : [ { }, @@ -4166,7 +4350,7 @@ ]], ["InitListExpr" , [ { - "pointer" : 162, + "pointer" : 171, "source_range" : [ { "column" : 29 @@ -4179,7 +4363,7 @@ [ ["CXXConstructExpr" , [ { - "pointer" : 163, + "pointer" : 172, "source_range" : [ { "column" : 30 @@ -4192,7 +4376,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 164, + "pointer" : 173, "source_range" : [ { "column" : 31 @@ -4216,7 +4400,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 165, + "pointer" : 174, "source_range" : [ { "column" : 34 @@ -4263,7 +4447,7 @@ ]], ["CXXConstructExpr" , [ { - "pointer" : 166, + "pointer" : 175, "source_range" : [ { "column" : 38 @@ -4276,7 +4460,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 167, + "pointer" : 176, "source_range" : [ { "column" : 39 @@ -4300,7 +4484,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 168, + "pointer" : 177, "source_range" : [ { "column" : 42 @@ -4347,7 +4531,7 @@ ]], ["CXXConstructExpr" , [ { - "pointer" : 169, + "pointer" : 178, "source_range" : [ { "column" : 46 @@ -4360,7 +4544,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 170, + "pointer" : 179, "source_range" : [ { "column" : 47 @@ -4384,7 +4568,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 171, + "pointer" : 180, "source_range" : [ { "column" : 50 @@ -4432,7 +4616,7 @@ ], { "qual_type" : { - "type_ptr" : 172 + "type_ptr" : 181 } } ]] @@ -4444,15 +4628,15 @@ }, { "is_array" : true, - "array_size_expr" : 160, - "initializer_expr" : 162 + "array_size_expr" : 169, + "initializer_expr" : 171 } ]] ], [ ["VarDecl" , [ { - "pointer" : 173, + "pointer" : 182, "source_range" : [ { "column" : 3 @@ -4474,7 +4658,7 @@ { "init_expr" : ["CXXNewExpr" , [ { - "pointer" : 159, + "pointer" : 168, "source_range" : [ { "column" : 15 @@ -4487,7 +4671,7 @@ [ ["ImplicitCastExpr" , [ { - "pointer" : 160, + "pointer" : 169, "source_range" : [ { "column" : 27 @@ -4499,7 +4683,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 161, + "pointer" : 170, "source_range" : [ { }, @@ -4535,7 +4719,7 @@ ]], ["InitListExpr" , [ { - "pointer" : 162, + "pointer" : 171, "source_range" : [ { "column" : 29 @@ -4548,7 +4732,7 @@ [ ["CXXConstructExpr" , [ { - "pointer" : 163, + "pointer" : 172, "source_range" : [ { "column" : 30 @@ -4561,7 +4745,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 164, + "pointer" : 173, "source_range" : [ { "column" : 31 @@ -4585,7 +4769,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 165, + "pointer" : 174, "source_range" : [ { "column" : 34 @@ -4632,7 +4816,7 @@ ]], ["CXXConstructExpr" , [ { - "pointer" : 166, + "pointer" : 175, "source_range" : [ { "column" : 38 @@ -4645,7 +4829,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 167, + "pointer" : 176, "source_range" : [ { "column" : 39 @@ -4669,7 +4853,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 168, + "pointer" : 177, "source_range" : [ { "column" : 42 @@ -4716,7 +4900,7 @@ ]], ["CXXConstructExpr" , [ { - "pointer" : 169, + "pointer" : 178, "source_range" : [ { "column" : 46 @@ -4729,7 +4913,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 170, + "pointer" : 179, "source_range" : [ { "column" : 47 @@ -4753,7 +4937,7 @@ ]], ["IntegerLiteral" , [ { - "pointer" : 171, + "pointer" : 180, "source_range" : [ { "column" : 50 @@ -4801,7 +4985,7 @@ ], { "qual_type" : { - "type_ptr" : 172 + "type_ptr" : 181 } } ]] @@ -4813,8 +4997,8 @@ }, { "is_array" : true, - "array_size_expr" : 160, - "initializer_expr" : 162 + "array_size_expr" : 169, + "initializer_expr" : 171 } ]] } @@ -4827,7 +5011,7 @@ ]], ["FunctionDecl" , [ { - "pointer" : 174, + "pointer" : 183, "source_range" : [ { "line" : 45, @@ -4848,7 +5032,7 @@ ] }, { - "type_ptr" : 175 + "type_ptr" : 184 }, { "mangled_name" : "13351464032276683690", @@ -4856,8 +5040,8 @@ "parameters" : [ ["ParmVarDecl" , [ { - "pointer" : 176, - "parent_pointer" : 174, + "pointer" : 185, + "parent_pointer" : 183, "source_range" : [ { "line" : 45, @@ -4883,8 +5067,8 @@ ]], ["ParmVarDecl" , [ { - "pointer" : 177, - "parent_pointer" : 174, + "pointer" : 186, + "parent_pointer" : 183, "source_range" : [ { "column" : 40 @@ -4909,8 +5093,8 @@ ]], ["ParmVarDecl" , [ { - "pointer" : 178, - "parent_pointer" : 174, + "pointer" : 187, + "parent_pointer" : 183, "source_range" : [ { "column" : 51 @@ -4936,10 +5120,10 @@ } ]] ], - "decl_ptr_with_body" : 174, + "decl_ptr_with_body" : 183, "body" : ["CompoundStmt" , [ { - "pointer" : 179, + "pointer" : 188, "source_range" : [ { "column" : 72 @@ -4953,7 +5137,7 @@ [ ["ReturnStmt" , [ { - "pointer" : 180, + "pointer" : 189, "source_range" : [ { "line" : 46, @@ -4967,7 +5151,7 @@ [ ["ImplicitCastExpr" , [ { - "pointer" : 181, + "pointer" : 190, "source_range" : [ { }, @@ -4978,7 +5162,7 @@ [ ["DeclRefExpr" , [ { - "pointer" : 182, + "pointer" : 191, "source_range" : [ { }, @@ -4997,7 +5181,7 @@ { "decl_ref" : { "kind" : "ParmVar", - "decl_pointer" : 178, + "decl_pointer" : 187, "name" : { "name" : "ptr2", "qual_name" : [ @@ -5031,7 +5215,7 @@ ]], ["EmptyDecl" , [ { - "pointer" : 183, + "pointer" : 192, "source_range" : [ { "line" : 47, @@ -5044,7 +5228,7 @@ ]], ["FunctionDecl" , [ { - "pointer" : 184, + "pointer" : 193, "source_range" : [ { "line" : 49, @@ -5063,7 +5247,7 @@ ] }, { - "type_ptr" : 185 + "type_ptr" : 194 }, { "mangled_name" : "1553186570458038035", @@ -5071,8 +5255,8 @@ "parameters" : [ ["ParmVarDecl" , [ { - "pointer" : 186, - "parent_pointer" : 184, + "pointer" : 195, + "parent_pointer" : 193, "source_range" : [ { "line" : 49, @@ -5099,10 +5283,10 @@ } ]] ], - "decl_ptr_with_body" : 184, + "decl_ptr_with_body" : 193, "body" : ["CompoundStmt" , [ { - "pointer" : 187, + "pointer" : 196, "source_range" : [ { "column" : 32 @@ -5116,7 +5300,7 @@ [ ["DeclStmt" , [ { - "pointer" : 188, + "pointer" : 197, "source_range" : [ { "line" : 50, @@ -5130,7 +5314,7 @@ [ ["IntegerLiteral" , [ { - "pointer" : 189, + "pointer" : 198, "source_range" : [ { "column" : 11 @@ -5156,7 +5340,7 @@ [ ["VarDecl" , [ { - "pointer" : 190, + "pointer" : 199, "source_range" : [ { "column" : 3 @@ -5181,7 +5365,7 @@ "is_init_ice" : true, "init_expr" : ["IntegerLiteral" , [ { - "pointer" : 189, + "pointer" : 198, "source_range" : [ { }, @@ -5208,7 +5392,7 @@ ]], ["DeclStmt" , [ { - "pointer" : 191, + "pointer" : 200, "source_range" : [ { "line" : 51, @@ -5222,7 +5406,7 @@ [ ["CXXNewExpr" , [ { - "pointer" : 192, + "pointer" : 201, "source_range" : [ { "column" : 13 @@ -5235,7 +5419,7 @@ [ ["CXXConstructExpr" , [ { - "pointer" : 193, + "pointer" : 202, "source_range" : [ { }, @@ -5269,7 +5453,7 @@ ]], ["ImplicitCastExpr" , [ { - "pointer" : 194, + "pointer" : 203, "source_range" : [ { "column" : 18 @@ -5281,7 +5465,7 @@ [ ["DeclRefExpr" , [ { - "pointer" : 195, + "pointer" : 204, "source_range" : [ { }, @@ -5300,7 +5484,7 @@ { "decl_ref" : { "kind" : "ParmVar", - "decl_pointer" : 186, + "decl_pointer" : 195, "name" : { "name" : "ptr", "qual_name" : [ @@ -5328,7 +5512,7 @@ ]], ["ImplicitCastExpr" , [ { - "pointer" : 196, + "pointer" : 205, "source_range" : [ { "column" : 23 @@ -5341,7 +5525,7 @@ [ ["UnaryOperator" , [ { - "pointer" : 197, + "pointer" : 206, "source_range" : [ { "column" : 23 @@ -5354,7 +5538,7 @@ [ ["DeclRefExpr" , [ { - "pointer" : 198, + "pointer" : 207, "source_range" : [ { }, @@ -5373,7 +5557,7 @@ { "decl_ref" : { "kind" : "Var", - "decl_pointer" : 190, + "decl_pointer" : 199, "name" : { "name" : "i", "qual_name" : [ @@ -5416,10 +5600,10 @@ } }, { - "initializer_expr" : 193, + "initializer_expr" : 202, "placement_args" : [ - 194, - 196 + 203, + 205 ] } ]] @@ -5427,7 +5611,7 @@ [ ["VarDecl" , [ { - "pointer" : 199, + "pointer" : 208, "source_range" : [ { "column" : 3 @@ -5449,7 +5633,7 @@ { "init_expr" : ["CXXNewExpr" , [ { - "pointer" : 192, + "pointer" : 201, "source_range" : [ { "column" : 13 @@ -5462,7 +5646,7 @@ [ ["CXXConstructExpr" , [ { - "pointer" : 193, + "pointer" : 202, "source_range" : [ { }, @@ -5496,7 +5680,7 @@ ]], ["ImplicitCastExpr" , [ { - "pointer" : 194, + "pointer" : 203, "source_range" : [ { "column" : 18 @@ -5508,7 +5692,7 @@ [ ["DeclRefExpr" , [ { - "pointer" : 195, + "pointer" : 204, "source_range" : [ { }, @@ -5527,7 +5711,7 @@ { "decl_ref" : { "kind" : "ParmVar", - "decl_pointer" : 186, + "decl_pointer" : 195, "name" : { "name" : "ptr", "qual_name" : [ @@ -5555,7 +5739,7 @@ ]], ["ImplicitCastExpr" , [ { - "pointer" : 196, + "pointer" : 205, "source_range" : [ { "column" : 23 @@ -5568,7 +5752,7 @@ [ ["UnaryOperator" , [ { - "pointer" : 197, + "pointer" : 206, "source_range" : [ { "column" : 23 @@ -5581,7 +5765,7 @@ [ ["DeclRefExpr" , [ { - "pointer" : 198, + "pointer" : 207, "source_range" : [ { }, @@ -5600,7 +5784,7 @@ { "decl_ref" : { "kind" : "Var", - "decl_pointer" : 190, + "decl_pointer" : 199, "name" : { "name" : "i", "qual_name" : [ @@ -5643,10 +5827,10 @@ } }, { - "initializer_expr" : 193, + "initializer_expr" : 202, "placement_args" : [ - 194, - 196 + 203, + 205 ] } ]] @@ -5660,7 +5844,7 @@ ]], ["TypedefDecl" , [ { - "pointer" : 200, + "pointer" : 209, "source_range" : [ { }, @@ -5675,7 +5859,7 @@ "instancetype" ] }, - 201, + 210, { } ]] @@ -5701,25 +5885,25 @@ ]], ["BuiltinType" , [ { - "pointer" : 202 + "pointer" : 211 }, "Bool" ]], ["BuiltinType" , [ { - "pointer" : 203 + "pointer" : 212 }, "Char_S" ]], ["BuiltinType" , [ { - "pointer" : 204 + "pointer" : 213 }, "SChar" ]], ["BuiltinType" , [ { - "pointer" : 205 + "pointer" : 214 }, "Short" ]], @@ -5731,31 +5915,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 206 + "pointer" : 215 }, "Long" ]], ["BuiltinType" , [ { - "pointer" : 207 + "pointer" : 216 }, "LongLong" ]], ["BuiltinType" , [ { - "pointer" : 208 + "pointer" : 217 }, "UChar" ]], ["BuiltinType" , [ { - "pointer" : 209 + "pointer" : 218 }, "UShort" ]], ["BuiltinType" , [ { - "pointer" : 210 + "pointer" : 219 }, "UInt" ]], @@ -5767,283 +5951,289 @@ ]], ["BuiltinType" , [ { - "pointer" : 211 + "pointer" : 220 }, "ULongLong" ]], ["BuiltinType" , [ { - "pointer" : 212 + "pointer" : 221 }, "Float" ]], ["BuiltinType" , [ { - "pointer" : 213 + "pointer" : 222 }, "Double" ]], ["BuiltinType" , [ { - "pointer" : 214 + "pointer" : 223 }, "LongDouble" ]], ["BuiltinType" , [ { - "pointer" : 215 + "pointer" : 224 }, "Float128" ]], ["BuiltinType" , [ { - "pointer" : 216 + "pointer" : 225 }, "Ibm128" ]], ["BuiltinType" , [ { - "pointer" : 217 + "pointer" : 226 }, "Float16" ]], ["BuiltinType" , [ { - "pointer" : 218 + "pointer" : 227 }, "ShortAccum" ]], ["BuiltinType" , [ { - "pointer" : 219 + "pointer" : 228 }, "Accum" ]], ["BuiltinType" , [ { - "pointer" : 220 + "pointer" : 229 }, "LongAccum" ]], ["BuiltinType" , [ { - "pointer" : 221 + "pointer" : 230 }, "UShortAccum" ]], ["BuiltinType" , [ { - "pointer" : 222 + "pointer" : 231 }, "UAccum" ]], ["BuiltinType" , [ { - "pointer" : 223 + "pointer" : 232 }, "ULongAccum" ]], ["BuiltinType" , [ { - "pointer" : 224 + "pointer" : 233 }, "ShortFract" ]], ["BuiltinType" , [ { - "pointer" : 225 + "pointer" : 234 }, "Fract" ]], ["BuiltinType" , [ { - "pointer" : 226 + "pointer" : 235 }, "LongFract" ]], ["BuiltinType" , [ { - "pointer" : 227 + "pointer" : 236 }, "UShortFract" ]], ["BuiltinType" , [ { - "pointer" : 228 + "pointer" : 237 }, "UFract" ]], ["BuiltinType" , [ { - "pointer" : 229 + "pointer" : 238 }, "ULongFract" ]], ["BuiltinType" , [ { - "pointer" : 230 + "pointer" : 239 }, "SatShortAccum" ]], ["BuiltinType" , [ { - "pointer" : 231 + "pointer" : 240 }, "SatAccum" ]], ["BuiltinType" , [ { - "pointer" : 232 + "pointer" : 241 }, "SatLongAccum" ]], ["BuiltinType" , [ { - "pointer" : 233 + "pointer" : 242 }, "SatUShortAccum" ]], ["BuiltinType" , [ { - "pointer" : 234 + "pointer" : 243 }, "SatUAccum" ]], ["BuiltinType" , [ { - "pointer" : 235 + "pointer" : 244 }, "SatULongAccum" ]], ["BuiltinType" , [ { - "pointer" : 236 + "pointer" : 245 }, "SatShortFract" ]], ["BuiltinType" , [ { - "pointer" : 237 + "pointer" : 246 }, "SatFract" ]], ["BuiltinType" , [ { - "pointer" : 238 + "pointer" : 247 }, "SatLongFract" ]], ["BuiltinType" , [ { - "pointer" : 239 + "pointer" : 248 }, "SatUShortFract" ]], ["BuiltinType" , [ { - "pointer" : 240 + "pointer" : 249 }, "SatUFract" ]], ["BuiltinType" , [ { - "pointer" : 241 + "pointer" : 250 }, "SatULongFract" ]], ["BuiltinType" , [ { - "pointer" : 242 + "pointer" : 251 }, "Int128" ]], ["BuiltinType" , [ { - "pointer" : 243 + "pointer" : 252 }, "UInt128" ]], ["BuiltinType" , [ { - "pointer" : 244 + "pointer" : 253 }, "WChar_S" ]], ["BuiltinType" , [ { - "pointer" : 245 + "pointer" : 254 }, "Char8" ]], ["BuiltinType" , [ { - "pointer" : 246 + "pointer" : 255 }, "Char16" ]], ["BuiltinType" , [ { - "pointer" : 247 + "pointer" : 256 }, "Char32" ]], ["BuiltinType" , [ { - "pointer" : 248 + "pointer" : 257 }, "Dependent" ]], ["BuiltinType" , [ { - "pointer" : 249 + "pointer" : 258 }, "Overload" ]], ["BuiltinType" , [ { - "pointer" : 250 + "pointer" : 259 }, "BoundMember" ]], ["BuiltinType" , [ { - "pointer" : 251 + "pointer" : 260 + }, + "UnresolvedTemplate" + ]], + ["BuiltinType" , [ + { + "pointer" : 261 }, "PseudoObject" ]], ["BuiltinType" , [ { - "pointer" : 252 + "pointer" : 262 }, "UnknownAny" ]], ["BuiltinType" , [ { - "pointer" : 253 + "pointer" : 263 }, "ARCUnbridgedCast" ]], ["BuiltinType" , [ { - "pointer" : 254 + "pointer" : 264 }, "BuiltinFn" ]], ["BuiltinType" , [ { - "pointer" : 255 + "pointer" : 265 }, "ObjCId" ]], ["BuiltinType" , [ { - "pointer" : 256 + "pointer" : 266 }, "ObjCClass" ]], ["BuiltinType" , [ { - "pointer" : 257 + "pointer" : 267 }, "ObjCSel" ]], @@ -6057,31 +6247,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 258 + "pointer" : 268 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 259 + "pointer" : 269 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 260 + "pointer" : 270 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 261 + "pointer" : 271 }, - 262 + 272 ]], ["PointerType" , [ { - "pointer" : 263 + "pointer" : 273 }, { "type_ptr" : 11, @@ -6090,34 +6280,34 @@ ]], ["PointerType" , [ { - "pointer" : 264 + "pointer" : 274 }, { - "type_ptr" : 203, + "type_ptr" : 212, "is_const" : true } ]], ["PointerType" , [ { - "pointer" : 265 + "pointer" : 275 }, { - "type_ptr" : 203 + "type_ptr" : 212 } ]], ["RecordType" , [ { - "pointer" : 266 + "pointer" : 276 }, - 267 + 277 ]], ["ConstantArrayType" , [ { - "pointer" : 268 + "pointer" : 278 }, { "element_type" : { - "type_ptr" : 266 + "type_ptr" : 276 }, "stride" : 24 }, @@ -6143,7 +6333,7 @@ ]], ["PointerType" , [ { - "pointer" : 269 + "pointer" : 279 }, { "type_ptr" : 25 @@ -6183,7 +6373,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 270 + "pointer" : 280 }, { "return_type" : { @@ -6195,7 +6385,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 271 + "pointer" : 281 }, { "type_ptr" : 8, @@ -6213,7 +6403,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 272 + "pointer" : 282 }, { "return_type" : { @@ -6223,7 +6413,7 @@ { "params_type" : [ { - "type_ptr" : 271 + "type_ptr" : 281 } ] } @@ -6247,7 +6437,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 273 + "pointer" : 283 }, { "type_ptr" : 8 @@ -6263,7 +6453,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 274 + "pointer" : 284 }, { "return_type" : { @@ -6273,7 +6463,7 @@ { "params_type" : [ { - "type_ptr" : 273 + "type_ptr" : 283 } ] } @@ -6309,7 +6499,7 @@ ]], ["PointerType" , [ { - "pointer" : 275 + "pointer" : 285 }, { "type_ptr" : 8 @@ -6325,7 +6515,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 276 + "pointer" : 286 }, { "type_ptr" : 8 @@ -6333,10 +6523,10 @@ ]], ["PointerType" , [ { - "pointer" : 277 + "pointer" : 287 }, { - "type_ptr" : 278 + "type_ptr" : 288 } ]], ["PointerType" , [ @@ -6366,7 +6556,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 185 + "pointer" : 194 }, { "return_type" : { @@ -6398,36 +6588,76 @@ ] } ]], + ["FunctionProtoType" , [ + { + "pointer" : 289 + }, + { + "return_type" : { + "type_ptr" : 102 + } + }, + { + "params_type" : [ + { + "type_ptr" : 136 + }, + { + "type_ptr" : 68 + } + ] + } + ]], + ["FunctionProtoType" , [ + { + "pointer" : 139 + }, + { + "return_type" : { + "type_ptr" : 102 + } + }, + { + "params_type" : [ + { + "type_ptr" : 136 + }, + { + "type_ptr" : 68 + } + ] + } + ]], ["TemplateTypeParmType" , [ { - "pointer" : 279 + "pointer" : 290 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 280 + "pointer" : 291 } ]], ["AutoType" , [ { - "pointer" : 281, - "desugared_type" : 280 + "pointer" : 292, + "desugared_type" : 291 } ]], ["PointerType" , [ { - "pointer" : 282 + "pointer" : 293 }, { - "type_ptr" : 279 + "type_ptr" : 290 } ]], ["PointerType" , [ { - "pointer" : 283 + "pointer" : 294 }, { - "type_ptr" : 281 + "type_ptr" : 292 } ]], ["AutoType" , [ @@ -6446,7 +6676,7 @@ ]], ["ConstantArrayType" , [ { - "pointer" : 284 + "pointer" : 295 }, { "element_type" : { @@ -6458,40 +6688,40 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 285 + "pointer" : 296 } ]], ["AutoType" , [ { - "pointer" : 286, - "desugared_type" : 285 + "pointer" : 297, + "desugared_type" : 296 } ]], ["PointerType" , [ { - "pointer" : 287 + "pointer" : 298 }, { - "type_ptr" : 286 + "type_ptr" : 297 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 288 + "pointer" : 299 } ]], ["AutoType" , [ { - "pointer" : 289, - "desugared_type" : 288 + "pointer" : 300, + "desugared_type" : 299 } ]], ["PointerType" , [ { - "pointer" : 290 + "pointer" : 301 }, { - "type_ptr" : 289 + "type_ptr" : 300 } ]], ["AutoType" , [ @@ -6510,7 +6740,7 @@ ]], ["ConstantArrayType" , [ { - "pointer" : 291 + "pointer" : 302 }, { "element_type" : { @@ -6534,15 +6764,15 @@ ]], ["PointerType" , [ { - "pointer" : 292 + "pointer" : 303 }, { - "type_ptr" : 291 + "type_ptr" : 302 } ]], ["PointerType" , [ { - "pointer" : 293 + "pointer" : 304 }, { "type_ptr" : 81 @@ -6550,7 +6780,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 294 + "pointer" : 305 }, { "return_type" : { @@ -6562,21 +6792,21 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 295 + "pointer" : 306 } ]], ["AutoType" , [ { - "pointer" : 296, - "desugared_type" : 295 + "pointer" : 307, + "desugared_type" : 306 } ]], ["PointerType" , [ { - "pointer" : 297 + "pointer" : 308 }, { - "type_ptr" : 296 + "type_ptr" : 307 } ]], ["ElaboratedType" , [ @@ -6595,7 +6825,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 298 + "pointer" : 309 }, { "type_ptr" : 25, @@ -6613,7 +6843,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 299 + "pointer" : 310 }, { "return_type" : { @@ -6623,7 +6853,7 @@ { "params_type" : [ { - "type_ptr" : 298 + "type_ptr" : 309 } ] } @@ -6647,7 +6877,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 300 + "pointer" : 311 }, { "type_ptr" : 25 @@ -6663,7 +6893,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 301 + "pointer" : 312 }, { "return_type" : { @@ -6673,7 +6903,7 @@ { "params_type" : [ { - "type_ptr" : 300 + "type_ptr" : 311 } ] } @@ -6697,7 +6927,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 302 + "pointer" : 313 }, { "type_ptr" : 25 @@ -6705,21 +6935,21 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 303 + "pointer" : 314 } ]], ["AutoType" , [ { - "pointer" : 304, - "desugared_type" : 303 + "pointer" : 315, + "desugared_type" : 314 } ]], ["PointerType" , [ { - "pointer" : 305 + "pointer" : 316 }, { - "type_ptr" : 304 + "type_ptr" : 315 } ]], ["AutoType" , [ @@ -6738,7 +6968,7 @@ ]], ["ConstantArrayType" , [ { - "pointer" : 306 + "pointer" : 317 }, { "element_type" : { @@ -6762,15 +6992,15 @@ ]], ["PointerType" , [ { - "pointer" : 307 + "pointer" : 318 }, { - "type_ptr" : 306 + "type_ptr" : 317 } ]], ["PointerType" , [ { - "pointer" : 308 + "pointer" : 319 }, { "type_ptr" : 97 @@ -6778,7 +7008,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 309 + "pointer" : 320 }, { "return_type" : { @@ -6790,26 +7020,26 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 310 + "pointer" : 321 } ]], ["AutoType" , [ { - "pointer" : 311, - "desugared_type" : 310 + "pointer" : 322, + "desugared_type" : 321 } ]], ["PointerType" , [ { - "pointer" : 312 + "pointer" : 323 }, { - "type_ptr" : 311 + "type_ptr" : 322 } ]], ["ConstantArrayType" , [ { - "pointer" : 150 + "pointer" : 159 }, { "element_type" : { @@ -6821,45 +7051,45 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 313 + "pointer" : 324 } ]], ["AutoType" , [ { - "pointer" : 314, - "desugared_type" : 313 + "pointer" : 325, + "desugared_type" : 324 } ]], ["PointerType" , [ { - "pointer" : 315 + "pointer" : 326 }, { - "type_ptr" : 314 + "type_ptr" : 325 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 316 + "pointer" : 327 } ]], ["AutoType" , [ { - "pointer" : 317, - "desugared_type" : 316 + "pointer" : 328, + "desugared_type" : 327 } ]], ["PointerType" , [ { - "pointer" : 318 + "pointer" : 329 }, { - "type_ptr" : 317 + "type_ptr" : 328 } ]], ["ConstantArrayType" , [ { - "pointer" : 319 + "pointer" : 330 }, { "element_type" : { @@ -6871,7 +7101,7 @@ ]], ["ConstantArrayType" , [ { - "pointer" : 172 + "pointer" : 181 }, { "element_type" : { @@ -6883,26 +7113,26 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 320 + "pointer" : 331 } ]], ["AutoType" , [ { - "pointer" : 321, - "desugared_type" : 320 + "pointer" : 332, + "desugared_type" : 331 } ]], ["PointerType" , [ { - "pointer" : 322 + "pointer" : 333 }, { - "type_ptr" : 321 + "type_ptr" : 332 } ]], ["FunctionProtoType" , [ { - "pointer" : 323 + "pointer" : 334 }, { "return_type" : { @@ -6925,7 +7155,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 175 + "pointer" : 184 }, { "return_type" : { @@ -6948,7 +7178,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 324 + "pointer" : 335 }, { "type_ptr" : 11 @@ -6956,7 +7186,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 325 + "pointer" : 336 }, { "return_type" : { @@ -6979,61 +7209,61 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 326 + "pointer" : 337 } ]], ["AutoType" , [ { - "pointer" : 327, - "desugared_type" : 326 + "pointer" : 338, + "desugared_type" : 337 } ]], ["PointerType" , [ { - "pointer" : 328 + "pointer" : 339 }, { - "type_ptr" : 327 + "type_ptr" : 338 } ]], ["ObjCObjectType" , [ { - "pointer" : 329 + "pointer" : 340 }, { - "base_type" : 255 + "base_type" : 265 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 330 + "pointer" : 341 }, { - "type_ptr" : 329 + "type_ptr" : 340 } ]], ["TypedefType" , [ { - "pointer" : 331, - "desugared_type" : 330 + "pointer" : 342, + "desugared_type" : 341 }, { "child_type" : { - "type_ptr" : 330 + "type_ptr" : 341 }, - "decl_ptr" : 332 + "decl_ptr" : 343 } ]], ["TypedefType" , [ { - "pointer" : 201, - "desugared_type" : 330 + "pointer" : 210, + "desugared_type" : 341 }, { "child_type" : { - "type_ptr" : 331 + "type_ptr" : 342 }, - "decl_ptr" : 200 + "decl_ptr" : 209 } ]], ["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 43b0ed0491f..0031049a8e0 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 @@ -707,47 +707,53 @@ { "pointer" : 75 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 76 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 77 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 78 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 79 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 80 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 81 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 82 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 82 + "pointer" : 83 }, { "type_ptr" : 21 @@ -755,31 +761,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 83 + "pointer" : 84 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 84 + "pointer" : 85 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 85 + "pointer" : 86 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 86 + "pointer" : 87 }, - 87 + 88 ]], ["PointerType" , [ { - "pointer" : 88 + "pointer" : 89 }, { "type_ptr" : 23, @@ -788,7 +794,7 @@ ]], ["PointerType" , [ { - "pointer" : 89 + "pointer" : 90 }, { "type_ptr" : 26, @@ -797,7 +803,7 @@ ]], ["PointerType" , [ { - "pointer" : 90 + "pointer" : 91 }, { "type_ptr" : 26 @@ -805,17 +811,17 @@ ]], ["RecordType" , [ { - "pointer" : 91 + "pointer" : 92 }, - 92 + 93 ]], ["ConstantArrayType" , [ { - "pointer" : 93 + "pointer" : 94 }, { "element_type" : { - "type_ptr" : 91 + "type_ptr" : 92 }, "stride" : 24 }, @@ -823,7 +829,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 94 + "pointer" : 95 }, { "return_type" : { @@ -859,18 +865,18 @@ ]], ["PointerType" , [ { - "pointer" : 95 + "pointer" : 96 }, { - "type_ptr" : 90 + "type_ptr" : 91 } ]], ["PointerType" , [ { - "pointer" : 96 + "pointer" : 97 }, { - "type_ptr" : 94 + "type_ptr" : 95 } ]], ["PointerType" , [ @@ -883,40 +889,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 97 + "pointer" : 98 }, { - "base_type" : 79 + "base_type" : 80 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 98 + "pointer" : 99 }, { - "type_ptr" : 97 + "type_ptr" : 98 } ]], ["TypedefType" , [ { - "pointer" : 99, - "desugared_type" : 98 + "pointer" : 100, + "desugared_type" : 99 }, { "child_type" : { - "type_ptr" : 98 + "type_ptr" : 99 }, - "decl_ptr" : 100 + "decl_ptr" : 101 } ]], ["TypedefType" , [ { "pointer" : 25, - "desugared_type" : 98 + "desugared_type" : 99 }, { "child_type" : { - "type_ptr" : 99 + "type_ptr" : 100 }, "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 5726d65d164..5a4bd9b8a2a 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 @@ -578,47 +578,53 @@ { "pointer" : 67 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 68 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 69 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 70 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 71 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 72 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 73 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 74 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 74 + "pointer" : 75 }, { "type_ptr" : 15 @@ -626,77 +632,77 @@ ]], ["BuiltinType" , [ { - "pointer" : 75 + "pointer" : 76 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 76 + "pointer" : 77 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 77 + "pointer" : 78 }, "BFloat16" ]], ["PointerType" , [ { - "pointer" : 78 + "pointer" : 79 }, { - "type_ptr" : 73 + "type_ptr" : 74 } ]], ["ObjCObjectType" , [ { - "pointer" : 79 + "pointer" : 80 }, { - "base_type" : 71 + "base_type" : 72 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 80 + "pointer" : 81 }, { - "type_ptr" : 79 + "type_ptr" : 80 } ]], ["ObjCObjectType" , [ { - "pointer" : 81 + "pointer" : 82 }, { - "base_type" : 72 + "base_type" : 73 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 82 + "pointer" : 83 }, { - "type_ptr" : 81 + "type_ptr" : 82 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 83 + "pointer" : 84 }, 8 ]], ["RecordType" , [ { - "pointer" : 84 + "pointer" : 85 }, - 85 + 86 ]], ["PointerType" , [ { - "pointer" : 86 + "pointer" : 87 }, { "type_ptr" : 20, @@ -705,7 +711,7 @@ ]], ["PointerType" , [ { - "pointer" : 87 + "pointer" : 88 }, { "type_ptr" : 17, @@ -714,7 +720,7 @@ ]], ["PointerType" , [ { - "pointer" : 88 + "pointer" : 89 }, { "type_ptr" : 17 @@ -722,17 +728,17 @@ ]], ["RecordType" , [ { - "pointer" : 89 + "pointer" : 90 }, - 90 + 91 ]], ["ConstantArrayType" , [ { - "pointer" : 91 + "pointer" : 92 }, { "element_type" : { - "type_ptr" : 89 + "type_ptr" : 90 }, "stride" : 24 }, @@ -740,44 +746,44 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 92 + "pointer" : 93 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 93 + "pointer" : 94 } ]], ["FunctionProtoType" , [ { - "pointer" : 94 + "pointer" : 95 }, { "return_type" : { - "type_ptr" : 74 + "type_ptr" : 75 } }, { "params_type" : [ { - "type_ptr" : 92 + "type_ptr" : 93 } ] } ]], ["FunctionProtoType" , [ { - "pointer" : 95 + "pointer" : 96 }, { "return_type" : { - "type_ptr" : 74 + "type_ptr" : 75 } }, { "params_type" : [ { - "type_ptr" : 93 + "type_ptr" : 94 } ] } @@ -785,11 +791,11 @@ ["TypedefType" , [ { "pointer" : 6, - "desugared_type" : 80 + "desugared_type" : 81 }, { "child_type" : { - "type_ptr" : 80 + "type_ptr" : 81 }, "decl_ptr" : 5 } @@ -797,7 +803,7 @@ ["TypedefType" , [ { "pointer" : 14, - "desugared_type" : 80 + "desugared_type" : 81 }, { "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 89b96af248d..cbd47b45675 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/optional.m.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/optional.m.exp @@ -1834,6 +1834,12 @@ }, "BoundMember" ]], + ["BuiltinType" , [ + { + "pointer" : 101 + }, + "UnresolvedTemplate" + ]], ["BuiltinType" , [ { "pointer" : 44 @@ -1842,43 +1848,43 @@ ]], ["BuiltinType" , [ { - "pointer" : 101 + "pointer" : 102 }, "UnknownAny" ]], ["BuiltinType" , [ { - "pointer" : 102 + "pointer" : 103 }, "ARCUnbridgedCast" ]], ["BuiltinType" , [ { - "pointer" : 103 + "pointer" : 104 }, "BuiltinFn" ]], ["BuiltinType" , [ { - "pointer" : 104 + "pointer" : 105 }, "ObjCId" ]], ["BuiltinType" , [ { - "pointer" : 105 + "pointer" : 106 }, "ObjCClass" ]], ["BuiltinType" , [ { - "pointer" : 106 + "pointer" : 107 }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 107 + "pointer" : 108 }, { "type_ptr" : 17 @@ -1886,77 +1892,77 @@ ]], ["BuiltinType" , [ { - "pointer" : 108 + "pointer" : 109 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 109 + "pointer" : 110 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 110 + "pointer" : 111 }, "BFloat16" ]], ["PointerType" , [ { - "pointer" : 111 + "pointer" : 112 }, { - "type_ptr" : 106 + "type_ptr" : 107 } ]], ["ObjCObjectType" , [ { - "pointer" : 112 + "pointer" : 113 }, { - "base_type" : 104 + "base_type" : 105 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 113 + "pointer" : 114 }, { - "type_ptr" : 112 + "type_ptr" : 113 } ]], ["ObjCObjectType" , [ { - "pointer" : 114 + "pointer" : 115 }, { - "base_type" : 105 + "base_type" : 106 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 115 + "pointer" : 116 }, { - "type_ptr" : 114 + "type_ptr" : 115 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 116 + "pointer" : 117 }, 9 ]], ["RecordType" , [ { - "pointer" : 117 + "pointer" : 118 }, - 118 + 119 ]], ["PointerType" , [ { - "pointer" : 119 + "pointer" : 120 }, { "type_ptr" : 56, @@ -1965,7 +1971,7 @@ ]], ["PointerType" , [ { - "pointer" : 120 + "pointer" : 121 }, { "type_ptr" : 53, @@ -1974,7 +1980,7 @@ ]], ["PointerType" , [ { - "pointer" : 121 + "pointer" : 122 }, { "type_ptr" : 53 @@ -1982,17 +1988,17 @@ ]], ["RecordType" , [ { - "pointer" : 122 + "pointer" : 123 }, - 123 + 124 ]], ["ConstantArrayType" , [ { - "pointer" : 124 + "pointer" : 125 }, { "element_type" : { - "type_ptr" : 122 + "type_ptr" : 123 }, "stride" : 24 }, @@ -2000,18 +2006,18 @@ ]], ["ObjCInterfaceType" , [ { - "pointer" : 125 + "pointer" : 126 }, 13 ]], ["TypedefType" , [ { "pointer" : 7, - "desugared_type" : 113 + "desugared_type" : 114 }, { "child_type" : { - "type_ptr" : 113 + "type_ptr" : 114 }, "decl_ptr" : 6 } @@ -2019,7 +2025,7 @@ ["TypedefType" , [ { "pointer" : 51, - "desugared_type" : 113 + "desugared_type" : 114 }, { "child_type" : { @@ -2031,33 +2037,33 @@ ["TypedefType" , [ { "pointer" : 5, - "desugared_type" : 111 + "desugared_type" : 112 }, { "child_type" : { - "type_ptr" : 111 + "type_ptr" : 112 }, "decl_ptr" : 4 } ]], ["ObjCInterfaceType" , [ { - "pointer" : 126 + "pointer" : 127 }, 20 ]], ["ElaboratedType" , [ { - "pointer" : 127, - "desugared_type" : 113 + "pointer" : 128, + "desugared_type" : 114 } ]], ["ObjCObjectType" , [ { - "pointer" : 128 + "pointer" : 129 }, { - "base_type" : 104, + "base_type" : 105, "protocol_decls_ptr" : [ 15 ] @@ -2068,7 +2074,7 @@ "pointer" : 22 }, { - "type_ptr" : 128 + "type_ptr" : 129 } ]], ["ObjCObjectPointerType" , [ @@ -2076,7 +2082,7 @@ "pointer" : 27 }, { - "type_ptr" : 126 + "type_ptr" : 127 } ]], ["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 1140c0a6f72..7958c3e236e 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 @@ -796,47 +796,53 @@ { "pointer" : 77 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 78 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 79 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 80 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 81 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 82 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 83 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 84 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 84 + "pointer" : 85 }, { "type_ptr" : 28 @@ -844,31 +850,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 85 + "pointer" : 86 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 86 + "pointer" : 87 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 87 + "pointer" : 88 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 88 + "pointer" : 89 }, - 89 + 90 ]], ["PointerType" , [ { - "pointer" : 90 + "pointer" : 91 }, { "type_ptr" : 12, @@ -877,7 +883,7 @@ ]], ["PointerType" , [ { - "pointer" : 91 + "pointer" : 92 }, { "type_ptr" : 25, @@ -886,7 +892,7 @@ ]], ["PointerType" , [ { - "pointer" : 92 + "pointer" : 93 }, { "type_ptr" : 25 @@ -894,17 +900,17 @@ ]], ["RecordType" , [ { - "pointer" : 93 + "pointer" : 94 }, - 94 + 95 ]], ["ConstantArrayType" , [ { - "pointer" : 95 + "pointer" : 96 }, { "element_type" : { - "type_ptr" : 93 + "type_ptr" : 94 }, "stride" : 24 }, @@ -917,22 +923,22 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 96 + "pointer" : 97 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 97 + "pointer" : 98 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 98 + "pointer" : 99 } ]], ["InjectedClassNameType" , [ { - "pointer" : 99 + "pointer" : 100 } ]], ["TemplateTypeParmType" , [ @@ -942,12 +948,12 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 100 + "pointer" : 101 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 101 + "pointer" : 102 } ]], ["InjectedClassNameType" , [ @@ -955,11 +961,6 @@ "pointer" : 9 } ]], - ["TemplateSpecializationType" , [ - { - "pointer" : 102 - } - ]], ["PointerType" , [ { "pointer" : 103 @@ -985,7 +986,7 @@ "pointer" : 104 }, { - "base_type" : 81 + "base_type" : 82 } ]], ["ObjCObjectPointerType" , [ diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/struct.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/struct.cpp.exp index 5ad9096b09e..28414278069 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/struct.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/struct.cpp.exp @@ -1377,47 +1377,53 @@ { "pointer" : 104 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 105 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 106 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 107 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 108 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 109 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 110 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 111 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 111 + "pointer" : 112 }, { "type_ptr" : 54 @@ -1425,31 +1431,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 112 + "pointer" : 113 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 113 + "pointer" : 114 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 114 + "pointer" : 115 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 115 + "pointer" : 116 }, - 116 + 117 ]], ["PointerType" , [ { - "pointer" : 117 + "pointer" : 118 }, { "type_ptr" : 44, @@ -1458,7 +1464,7 @@ ]], ["PointerType" , [ { - "pointer" : 118 + "pointer" : 119 }, { "type_ptr" : 56, @@ -1467,7 +1473,7 @@ ]], ["PointerType" , [ { - "pointer" : 119 + "pointer" : 120 }, { "type_ptr" : 56 @@ -1475,17 +1481,17 @@ ]], ["RecordType" , [ { - "pointer" : 120 + "pointer" : 121 }, - 121 + 122 ]], ["ConstantArrayType" , [ { - "pointer" : 122 + "pointer" : 123 }, { "element_type" : { - "type_ptr" : 120 + "type_ptr" : 121 }, "stride" : 24 }, @@ -1523,7 +1529,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 123 + "pointer" : 124 }, { "return_type" : { @@ -1535,7 +1541,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 124 + "pointer" : 125 }, { "type_ptr" : 18, @@ -1553,7 +1559,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 125 + "pointer" : 126 }, { "return_type" : { @@ -1563,7 +1569,7 @@ { "params_type" : [ { - "type_ptr" : 124 + "type_ptr" : 125 } ] } @@ -1587,7 +1593,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 126 + "pointer" : 127 }, { "type_ptr" : 18 @@ -1603,7 +1609,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 127 + "pointer" : 128 }, { "return_type" : { @@ -1613,7 +1619,7 @@ { "params_type" : [ { - "type_ptr" : 126 + "type_ptr" : 127 } ] } @@ -1649,7 +1655,7 @@ ]], ["PointerType" , [ { - "pointer" : 128 + "pointer" : 129 }, { "type_ptr" : 18 @@ -1657,7 +1663,7 @@ ]], ["PointerType" , [ { - "pointer" : 129 + "pointer" : 130 }, { "type_ptr" : 33 @@ -1665,7 +1671,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 130 + "pointer" : 131 }, { "type_ptr" : 18 @@ -1691,40 +1697,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 131 + "pointer" : 132 }, { - "base_type" : 108 + "base_type" : 109 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 132 + "pointer" : 133 }, { - "type_ptr" : 131 + "type_ptr" : 132 } ]], ["TypedefType" , [ { - "pointer" : 133, - "desugared_type" : 132 + "pointer" : 134, + "desugared_type" : 133 }, { "child_type" : { - "type_ptr" : 132 + "type_ptr" : 133 }, - "decl_ptr" : 134 + "decl_ptr" : 135 } ]], ["TypedefType" , [ { "pointer" : 53, - "desugared_type" : 132 + "desugared_type" : 133 }, { "child_type" : { - "type_ptr" : 133 + "type_ptr" : 134 }, "decl_ptr" : 52 } 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 3857c51a2e7..ab093c84eab 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/template_instantiations.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/template_instantiations.cpp.exp @@ -3936,47 +3936,53 @@ { "pointer" : 242 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 243 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 244 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 245 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 246 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 247 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 248 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 249 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 249 + "pointer" : 250 }, { "type_ptr" : 191 @@ -3984,31 +3990,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 250 + "pointer" : 251 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 251 + "pointer" : 252 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 252 + "pointer" : 253 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 253 + "pointer" : 254 }, - 254 + 255 ]], ["PointerType" , [ { - "pointer" : 255 + "pointer" : 256 }, { "type_ptr" : 10, @@ -4017,7 +4023,7 @@ ]], ["PointerType" , [ { - "pointer" : 256 + "pointer" : 257 }, { "type_ptr" : 193, @@ -4026,7 +4032,7 @@ ]], ["PointerType" , [ { - "pointer" : 257 + "pointer" : 258 }, { "type_ptr" : 193 @@ -4034,17 +4040,17 @@ ]], ["RecordType" , [ { - "pointer" : 258 + "pointer" : 259 }, - 259 + 260 ]], ["ConstantArrayType" , [ { - "pointer" : 260 + "pointer" : 261 }, { "element_type" : { - "type_ptr" : 258 + "type_ptr" : 259 }, "stride" : 24 }, @@ -4052,37 +4058,37 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 261 + "pointer" : 262 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 262 + "pointer" : 263 } ]], ["PackExpansionType" , [ { - "pointer" : 263 + "pointer" : 264 } ]], ["PackExpansionType" , [ { - "pointer" : 264 + "pointer" : 265 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 265 + "pointer" : 266 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 266 + "pointer" : 267 } ]], ["InjectedClassNameType" , [ { - "pointer" : 267 + "pointer" : 268 } ]], ["RecordType" , [ @@ -4093,13 +4099,13 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 268, + "pointer" : 269, "desugared_type" : 9 } ]], ["ElaboratedType" , [ { - "pointer" : 269, + "pointer" : 270, "desugared_type" : 9 } ]], @@ -4111,7 +4117,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 270, + "pointer" : 271, "desugared_type" : 12 } ]], @@ -4123,7 +4129,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 271 + "pointer" : 272 }, { "return_type" : { @@ -4135,7 +4141,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 272 + "pointer" : 273 }, { "return_type" : { @@ -4147,13 +4153,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 273, + "pointer" : 274, "desugared_type" : 12 } ]], ["LValueReferenceType" , [ { - "pointer" : 274 + "pointer" : 275 }, { "type_ptr" : 12, @@ -4165,13 +4171,13 @@ "pointer" : 20 }, { - "type_ptr" : 273, + "type_ptr" : 274, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 275 + "pointer" : 276 }, { "return_type" : { @@ -4181,7 +4187,7 @@ { "params_type" : [ { - "type_ptr" : 274 + "type_ptr" : 275 } ] } @@ -4205,7 +4211,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 276 + "pointer" : 277 }, { "type_ptr" : 12 @@ -4216,12 +4222,12 @@ "pointer" : 24 }, { - "type_ptr" : 273 + "type_ptr" : 274 } ]], ["FunctionProtoType" , [ { - "pointer" : 277 + "pointer" : 278 }, { "return_type" : { @@ -4231,7 +4237,7 @@ { "params_type" : [ { - "type_ptr" : 276 + "type_ptr" : 277 } ] } @@ -4267,7 +4273,7 @@ ]], ["PointerType" , [ { - "pointer" : 278 + "pointer" : 279 }, { "type_ptr" : 12 @@ -4275,7 +4281,7 @@ ]], ["PointerType" , [ { - "pointer" : 279 + "pointer" : 280 }, { "type_ptr" : 26 @@ -4283,7 +4289,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 280 + "pointer" : 281 }, { "type_ptr" : 12 @@ -4291,44 +4297,44 @@ ]], ["DecltypeType" , [ { - "pointer" : 281, - "desugared_type" : 250 + "pointer" : 282, + "desugared_type" : 251 }, { - "type_ptr" : 250 + "type_ptr" : 251 } ]], ["TypedefType" , [ { "pointer" : 29, - "desugared_type" : 250 + "desugared_type" : 251 }, { "child_type" : { - "type_ptr" : 281 + "type_ptr" : 282 }, "decl_ptr" : 28 } ]], ["ElaboratedType" , [ { - "pointer" : 282, - "desugared_type" : 250 + "pointer" : 283, + "desugared_type" : 251 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 283 + "pointer" : 284 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 284 + "pointer" : 285 } ]], ["InjectedClassNameType" , [ { - "pointer" : 285 + "pointer" : 286 } ]], ["RecordType" , [ @@ -4339,7 +4345,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 286, + "pointer" : 287, "desugared_type" : 32 } ]], @@ -4351,7 +4357,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 287 + "pointer" : 288 }, { "return_type" : { @@ -4363,13 +4369,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 288, + "pointer" : 289, "desugared_type" : 32 } ]], ["LValueReferenceType" , [ { - "pointer" : 289 + "pointer" : 290 }, { "type_ptr" : 32, @@ -4381,13 +4387,13 @@ "pointer" : 39 }, { - "type_ptr" : 288, + "type_ptr" : 289, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 290 + "pointer" : 291 }, { "return_type" : { @@ -4397,7 +4403,7 @@ { "params_type" : [ { - "type_ptr" : 289 + "type_ptr" : 290 } ] } @@ -4421,7 +4427,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 291 + "pointer" : 292 }, { "type_ptr" : 32 @@ -4432,12 +4438,12 @@ "pointer" : 43 }, { - "type_ptr" : 288 + "type_ptr" : 289 } ]], ["FunctionProtoType" , [ { - "pointer" : 292 + "pointer" : 293 }, { "return_type" : { @@ -4447,7 +4453,7 @@ { "params_type" : [ { - "type_ptr" : 291 + "type_ptr" : 292 } ] } @@ -4471,7 +4477,7 @@ ]], ["PointerType" , [ { - "pointer" : 293 + "pointer" : 294 }, { "type_ptr" : 32 @@ -4479,7 +4485,7 @@ ]], ["PointerType" , [ { - "pointer" : 294 + "pointer" : 295 }, { "type_ptr" : 45 @@ -4487,7 +4493,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 295 + "pointer" : 296 }, { "type_ptr" : 32 @@ -4495,47 +4501,47 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 296 + "pointer" : 297 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 297 + "pointer" : 298 } ]], ["InjectedClassNameType" , [ { - "pointer" : 298 + "pointer" : 299 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 299 + "pointer" : 300 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 300 + "pointer" : 301 } ]], ["InjectedClassNameType" , [ { - "pointer" : 301 + "pointer" : 302 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 302 + "pointer" : 303 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 303 + "pointer" : 304 } ]], ["InjectedClassNameType" , [ { - "pointer" : 304 + "pointer" : 305 } ]], ["RecordType" , [ @@ -4546,7 +4552,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 305, + "pointer" : 306, "desugared_type" : 49 } ]], @@ -4558,7 +4564,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 306 + "pointer" : 307 }, { "return_type" : { @@ -4570,13 +4576,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 307, + "pointer" : 308, "desugared_type" : 49 } ]], ["LValueReferenceType" , [ { - "pointer" : 308 + "pointer" : 309 }, { "type_ptr" : 49, @@ -4588,13 +4594,13 @@ "pointer" : 56 }, { - "type_ptr" : 307, + "type_ptr" : 308, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 309 + "pointer" : 310 }, { "return_type" : { @@ -4604,7 +4610,7 @@ { "params_type" : [ { - "type_ptr" : 308 + "type_ptr" : 309 } ] } @@ -4628,7 +4634,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 310 + "pointer" : 311 }, { "type_ptr" : 49 @@ -4639,12 +4645,12 @@ "pointer" : 60 }, { - "type_ptr" : 307 + "type_ptr" : 308 } ]], ["FunctionProtoType" , [ { - "pointer" : 311 + "pointer" : 312 }, { "return_type" : { @@ -4654,7 +4660,7 @@ { "params_type" : [ { - "type_ptr" : 310 + "type_ptr" : 311 } ] } @@ -4678,7 +4684,7 @@ ]], ["PointerType" , [ { - "pointer" : 312 + "pointer" : 313 }, { "type_ptr" : 49 @@ -4686,7 +4692,7 @@ ]], ["PointerType" , [ { - "pointer" : 313 + "pointer" : 314 }, { "type_ptr" : 90 @@ -4694,7 +4700,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 314 + "pointer" : 315 }, { "type_ptr" : 49 @@ -4708,7 +4714,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 315, + "pointer" : 316, "desugared_type" : 63 } ]], @@ -4720,7 +4726,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 316 + "pointer" : 317 }, { "return_type" : { @@ -4732,13 +4738,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 317, + "pointer" : 318, "desugared_type" : 63 } ]], ["LValueReferenceType" , [ { - "pointer" : 318 + "pointer" : 319 }, { "type_ptr" : 63, @@ -4750,13 +4756,13 @@ "pointer" : 70 }, { - "type_ptr" : 317, + "type_ptr" : 318, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 319 + "pointer" : 320 }, { "return_type" : { @@ -4766,7 +4772,7 @@ { "params_type" : [ { - "type_ptr" : 318 + "type_ptr" : 319 } ] } @@ -4790,7 +4796,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 320 + "pointer" : 321 }, { "type_ptr" : 63 @@ -4801,12 +4807,12 @@ "pointer" : 74 }, { - "type_ptr" : 317 + "type_ptr" : 318 } ]], ["FunctionProtoType" , [ { - "pointer" : 321 + "pointer" : 322 }, { "return_type" : { @@ -4816,7 +4822,7 @@ { "params_type" : [ { - "type_ptr" : 320 + "type_ptr" : 321 } ] } @@ -4840,7 +4846,7 @@ ]], ["PointerType" , [ { - "pointer" : 322 + "pointer" : 323 }, { "type_ptr" : 63 @@ -4848,7 +4854,7 @@ ]], ["PointerType" , [ { - "pointer" : 323 + "pointer" : 324 }, { "type_ptr" : 93 @@ -4856,7 +4862,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 324 + "pointer" : 325 }, { "type_ptr" : 63 @@ -4870,7 +4876,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 325, + "pointer" : 326, "desugared_type" : 77 } ]], @@ -4882,7 +4888,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 326 + "pointer" : 327 }, { "return_type" : { @@ -4894,13 +4900,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 327, + "pointer" : 328, "desugared_type" : 77 } ]], ["LValueReferenceType" , [ { - "pointer" : 328 + "pointer" : 329 }, { "type_ptr" : 77, @@ -4912,13 +4918,13 @@ "pointer" : 84 }, { - "type_ptr" : 327, + "type_ptr" : 328, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 329 + "pointer" : 330 }, { "return_type" : { @@ -4928,7 +4934,7 @@ { "params_type" : [ { - "type_ptr" : 328 + "type_ptr" : 329 } ] } @@ -4952,7 +4958,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 330 + "pointer" : 331 }, { "type_ptr" : 77 @@ -4963,12 +4969,12 @@ "pointer" : 88 }, { - "type_ptr" : 327 + "type_ptr" : 328 } ]], ["FunctionProtoType" , [ { - "pointer" : 331 + "pointer" : 332 }, { "return_type" : { @@ -4978,7 +4984,7 @@ { "params_type" : [ { - "type_ptr" : 330 + "type_ptr" : 331 } ] } @@ -5002,7 +5008,7 @@ ]], ["PointerType" , [ { - "pointer" : 332 + "pointer" : 333 }, { "type_ptr" : 77 @@ -5010,7 +5016,7 @@ ]], ["PointerType" , [ { - "pointer" : 333 + "pointer" : 334 }, { "type_ptr" : 96 @@ -5018,7 +5024,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 334 + "pointer" : 335 }, { "type_ptr" : 77 @@ -5026,17 +5032,17 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 335 + "pointer" : 336 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 336 + "pointer" : 337 } ]], ["InjectedClassNameType" , [ { - "pointer" : 337 + "pointer" : 338 } ]], ["ConstantArrayType" , [ @@ -5065,7 +5071,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 338 + "pointer" : 339 }, { "type_ptr" : 115, @@ -5083,22 +5089,22 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 339 + "pointer" : 340 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 340 + "pointer" : 341 } ]], ["InjectedClassNameType" , [ { - "pointer" : 341 + "pointer" : 342 } ]], ["FunctionProtoType" , [ { - "pointer" : 342 + "pointer" : 343 }, { "return_type" : { @@ -5110,7 +5116,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 343 + "pointer" : 344 }, { "return_type" : { @@ -5120,7 +5126,7 @@ { "params_type" : [ { - "type_ptr" : 338 + "type_ptr" : 339 } ] } @@ -5144,7 +5150,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 344 + "pointer" : 345 }, { "type_ptr" : 115 @@ -5160,7 +5166,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 345 + "pointer" : 346 }, { "return_type" : { @@ -5170,7 +5176,7 @@ { "params_type" : [ { - "type_ptr" : 344 + "type_ptr" : 345 } ] } @@ -5194,7 +5200,7 @@ ]], ["PointerType" , [ { - "pointer" : 346 + "pointer" : 347 }, { "type_ptr" : 115 @@ -5202,7 +5208,7 @@ ]], ["PointerType" , [ { - "pointer" : 347 + "pointer" : 348 }, { "type_ptr" : 142 @@ -5210,7 +5216,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 348 + "pointer" : 349 }, { "type_ptr" : 115 @@ -5230,7 +5236,7 @@ ]], ["ParenType" , [ { - "pointer" : 349, + "pointer" : 350, "desugared_type" : 159 }, { @@ -5239,7 +5245,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 350 + "pointer" : 351 }, { "type_ptr" : 159 @@ -5247,25 +5253,25 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 351 + "pointer" : 352 }, { - "type_ptr" : 349 + "type_ptr" : 350 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 352 + "pointer" : 353 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 353 + "pointer" : 354 } ]], ["InjectedClassNameType" , [ { - "pointer" : 354 + "pointer" : 355 } ]], ["FunctionProtoType" , [ @@ -5287,7 +5293,7 @@ ]], ["ParenType" , [ { - "pointer" : 355, + "pointer" : 356, "desugared_type" : 161 }, { @@ -5296,7 +5302,7 @@ ]], ["PointerType" , [ { - "pointer" : 356 + "pointer" : 357 }, { "type_ptr" : 161 @@ -5304,30 +5310,30 @@ ]], ["PointerType" , [ { - "pointer" : 357 + "pointer" : 358 }, { - "type_ptr" : 355 + "type_ptr" : 356 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 358 + "pointer" : 359 } ]], ["TemplateSpecializationType" , [ { - "pointer" : 359 + "pointer" : 360 } ]], ["InjectedClassNameType" , [ { - "pointer" : 360 + "pointer" : 361 } ]], ["PointerType" , [ { - "pointer" : 361 + "pointer" : 362 }, { "type_ptr" : 10 @@ -5341,7 +5347,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 362, + "pointer" : 363, "desugared_type" : 100 } ]], @@ -5353,7 +5359,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 363 + "pointer" : 364 }, { "return_type" : { @@ -5365,13 +5371,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 364, + "pointer" : 365, "desugared_type" : 100 } ]], ["LValueReferenceType" , [ { - "pointer" : 365 + "pointer" : 366 }, { "type_ptr" : 100, @@ -5383,13 +5389,13 @@ "pointer" : 107 }, { - "type_ptr" : 364, + "type_ptr" : 365, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 366 + "pointer" : 367 }, { "return_type" : { @@ -5399,7 +5405,7 @@ { "params_type" : [ { - "type_ptr" : 365 + "type_ptr" : 366 } ] } @@ -5423,7 +5429,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 367 + "pointer" : 368 }, { "type_ptr" : 100 @@ -5434,12 +5440,12 @@ "pointer" : 111 }, { - "type_ptr" : 364 + "type_ptr" : 365 } ]], ["FunctionProtoType" , [ { - "pointer" : 368 + "pointer" : 369 }, { "return_type" : { @@ -5449,7 +5455,7 @@ { "params_type" : [ { - "type_ptr" : 367 + "type_ptr" : 368 } ] } @@ -5473,7 +5479,7 @@ ]], ["PointerType" , [ { - "pointer" : 369 + "pointer" : 370 }, { "type_ptr" : 100 @@ -5481,7 +5487,7 @@ ]], ["PointerType" , [ { - "pointer" : 370 + "pointer" : 371 }, { "type_ptr" : 178 @@ -5489,7 +5495,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 371 + "pointer" : 372 }, { "type_ptr" : 100 @@ -5503,7 +5509,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 372, + "pointer" : 373, "desugared_type" : 129 } ]], @@ -5515,7 +5521,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 373 + "pointer" : 374 }, { "return_type" : { @@ -5527,13 +5533,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 374, + "pointer" : 375, "desugared_type" : 129 } ]], ["LValueReferenceType" , [ { - "pointer" : 375 + "pointer" : 376 }, { "type_ptr" : 129, @@ -5545,13 +5551,13 @@ "pointer" : 136 }, { - "type_ptr" : 374, + "type_ptr" : 375, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 376 + "pointer" : 377 }, { "return_type" : { @@ -5561,7 +5567,7 @@ { "params_type" : [ { - "type_ptr" : 375 + "type_ptr" : 376 } ] } @@ -5585,7 +5591,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 377 + "pointer" : 378 }, { "type_ptr" : 129 @@ -5596,12 +5602,12 @@ "pointer" : 140 }, { - "type_ptr" : 374 + "type_ptr" : 375 } ]], ["FunctionProtoType" , [ { - "pointer" : 378 + "pointer" : 379 }, { "return_type" : { @@ -5611,7 +5617,7 @@ { "params_type" : [ { - "type_ptr" : 377 + "type_ptr" : 378 } ] } @@ -5635,7 +5641,7 @@ ]], ["PointerType" , [ { - "pointer" : 379 + "pointer" : 380 }, { "type_ptr" : 129 @@ -5643,7 +5649,7 @@ ]], ["PointerType" , [ { - "pointer" : 380 + "pointer" : 381 }, { "type_ptr" : 181 @@ -5651,7 +5657,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 381 + "pointer" : 382 }, { "type_ptr" : 129 @@ -5665,7 +5671,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 382, + "pointer" : 383, "desugared_type" : 146 } ]], @@ -5677,7 +5683,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 383 + "pointer" : 384 }, { "return_type" : { @@ -5689,13 +5695,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 384, + "pointer" : 385, "desugared_type" : 146 } ]], ["LValueReferenceType" , [ { - "pointer" : 385 + "pointer" : 386 }, { "type_ptr" : 146, @@ -5707,13 +5713,13 @@ "pointer" : 153 }, { - "type_ptr" : 384, + "type_ptr" : 385, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 386 + "pointer" : 387 }, { "return_type" : { @@ -5723,7 +5729,7 @@ { "params_type" : [ { - "type_ptr" : 385 + "type_ptr" : 386 } ] } @@ -5747,7 +5753,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 387 + "pointer" : 388 }, { "type_ptr" : 146 @@ -5758,12 +5764,12 @@ "pointer" : 157 }, { - "type_ptr" : 384 + "type_ptr" : 385 } ]], ["FunctionProtoType" , [ { - "pointer" : 388 + "pointer" : 389 }, { "return_type" : { @@ -5773,7 +5779,7 @@ { "params_type" : [ { - "type_ptr" : 387 + "type_ptr" : 388 } ] } @@ -5797,7 +5803,7 @@ ]], ["PointerType" , [ { - "pointer" : 389 + "pointer" : 390 }, { "type_ptr" : 146 @@ -5805,7 +5811,7 @@ ]], ["PointerType" , [ { - "pointer" : 390 + "pointer" : 391 }, { "type_ptr" : 184 @@ -5813,7 +5819,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 391 + "pointer" : 392 }, { "type_ptr" : 146 @@ -5821,7 +5827,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 392 + "pointer" : 393 }, { "type_ptr" : 161 @@ -5835,7 +5841,7 @@ ]], ["TemplateSpecializationType" , [ { - "pointer" : 393, + "pointer" : 394, "desugared_type" : 165 } ]], @@ -5847,7 +5853,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 394 + "pointer" : 395 }, { "return_type" : { @@ -5859,13 +5865,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 395, + "pointer" : 396, "desugared_type" : 165 } ]], ["LValueReferenceType" , [ { - "pointer" : 396 + "pointer" : 397 }, { "type_ptr" : 165, @@ -5877,13 +5883,13 @@ "pointer" : 172 }, { - "type_ptr" : 395, + "type_ptr" : 396, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 397 + "pointer" : 398 }, { "return_type" : { @@ -5893,7 +5899,7 @@ { "params_type" : [ { - "type_ptr" : 396 + "type_ptr" : 397 } ] } @@ -5917,7 +5923,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 398 + "pointer" : 399 }, { "type_ptr" : 165 @@ -5928,12 +5934,12 @@ "pointer" : 176 }, { - "type_ptr" : 395 + "type_ptr" : 396 } ]], ["FunctionProtoType" , [ { - "pointer" : 399 + "pointer" : 400 }, { "return_type" : { @@ -5943,7 +5949,7 @@ { "params_type" : [ { - "type_ptr" : 398 + "type_ptr" : 399 } ] } @@ -5967,7 +5973,7 @@ ]], ["PointerType" , [ { - "pointer" : 400 + "pointer" : 401 }, { "type_ptr" : 165 @@ -5975,7 +5981,7 @@ ]], ["PointerType" , [ { - "pointer" : 401 + "pointer" : 402 }, { "type_ptr" : 187 @@ -5983,7 +5989,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 402 + "pointer" : 403 }, { "type_ptr" : 165 @@ -5991,60 +5997,60 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 403 + "pointer" : 404 }, { - "base_type" : 246 + "base_type" : 247 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 404 + "pointer" : 405 }, { - "type_ptr" : 403 + "type_ptr" : 404 } ]], ["TypedefType" , [ { - "pointer" : 405, - "desugared_type" : 404 + "pointer" : 406, + "desugared_type" : 405 }, { "child_type" : { - "type_ptr" : 404 + "type_ptr" : 405 }, - "decl_ptr" : 406 + "decl_ptr" : 407 } ]], ["TypedefType" , [ { "pointer" : 190, - "desugared_type" : 404 + "desugared_type" : 405 }, { "child_type" : { - "type_ptr" : 405 + "type_ptr" : 406 }, "decl_ptr" : 189 } ]], ["DecayedType" , [ { - "pointer" : 407, - "desugared_type" : 361 + "pointer" : 408, + "desugared_type" : 362 }, { - "type_ptr" : 361 + "type_ptr" : 362 } ]], ["DecayedType" , [ { - "pointer" : 408, - "desugared_type" : 361 + "pointer" : 409, + "desugared_type" : 362 }, { - "type_ptr" : 361 + "type_ptr" : 362 } ]], ["NoneType" , [ diff --git a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/this.cpp.exp b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/this.cpp.exp index dc124d864c3..da463f0ea82 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/this.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/this.cpp.exp @@ -726,47 +726,53 @@ { "pointer" : 73 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 74 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 75 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 76 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 77 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 78 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 79 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 80 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 80 + "pointer" : 81 }, { "type_ptr" : 22 @@ -774,31 +780,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 81 + "pointer" : 82 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 82 + "pointer" : 83 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 83 + "pointer" : 84 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 84 + "pointer" : 85 }, - 85 + 86 ]], ["PointerType" , [ { - "pointer" : 86 + "pointer" : 87 }, { "type_ptr" : 11, @@ -807,7 +813,7 @@ ]], ["PointerType" , [ { - "pointer" : 87 + "pointer" : 88 }, { "type_ptr" : 24, @@ -816,7 +822,7 @@ ]], ["PointerType" , [ { - "pointer" : 88 + "pointer" : 89 }, { "type_ptr" : 24 @@ -824,17 +830,17 @@ ]], ["RecordType" , [ { - "pointer" : 89 + "pointer" : 90 }, - 90 + 91 ]], ["ConstantArrayType" , [ { - "pointer" : 91 + "pointer" : 92 }, { "element_type" : { - "type_ptr" : 89 + "type_ptr" : 90 }, "stride" : 24 }, @@ -868,40 +874,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 92 + "pointer" : 93 }, { - "base_type" : 77 + "base_type" : 78 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 93 + "pointer" : 94 }, { - "type_ptr" : 92 + "type_ptr" : 93 } ]], ["TypedefType" , [ { - "pointer" : 94, - "desugared_type" : 93 + "pointer" : 95, + "desugared_type" : 94 }, { "child_type" : { - "type_ptr" : 93 + "type_ptr" : 94 }, - "decl_ptr" : 95 + "decl_ptr" : 96 } ]], ["TypedefType" , [ { "pointer" : 21, - "desugared_type" : 93 + "desugared_type" : 94 }, { "child_type" : { - "type_ptr" : 94 + "type_ptr" : 95 }, "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 2b9b7b763d0..74f85d60058 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/type_trait.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/type_trait.cpp.exp @@ -1187,47 +1187,53 @@ { "pointer" : 96 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 97 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 98 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 99 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 100 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 101 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 102 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 103 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 103 + "pointer" : 104 }, { "type_ptr" : 46 @@ -1235,31 +1241,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 104 + "pointer" : 105 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 105 + "pointer" : 106 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 106 + "pointer" : 107 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 107 + "pointer" : 108 }, - 108 + 109 ]], ["PointerType" , [ { - "pointer" : 109 + "pointer" : 110 }, { "type_ptr" : 30, @@ -1268,7 +1274,7 @@ ]], ["PointerType" , [ { - "pointer" : 110 + "pointer" : 111 }, { "type_ptr" : 47, @@ -1277,7 +1283,7 @@ ]], ["PointerType" , [ { - "pointer" : 111 + "pointer" : 112 }, { "type_ptr" : 47 @@ -1285,17 +1291,17 @@ ]], ["RecordType" , [ { - "pointer" : 112 + "pointer" : 113 }, - 113 + 114 ]], ["ConstantArrayType" , [ { - "pointer" : 114 + "pointer" : 115 }, { "element_type" : { - "type_ptr" : 112 + "type_ptr" : 113 }, "stride" : 24 }, @@ -1309,7 +1315,7 @@ ]], ["PointerType" , [ { - "pointer" : 115 + "pointer" : 116 }, { "type_ptr" : 8 @@ -1329,13 +1335,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 116, + "pointer" : 117, "desugared_type" : 8 } ]], ["LValueReferenceType" , [ { - "pointer" : 117 + "pointer" : 118 }, { "type_ptr" : 8 @@ -1343,15 +1349,15 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 118 + "pointer" : 119 }, { - "type_ptr" : 116 + "type_ptr" : 117 } ]], ["LValueReferenceType" , [ { - "pointer" : 119 + "pointer" : 120 }, { "type_ptr" : 8, @@ -1363,23 +1369,23 @@ "pointer" : 16 }, { - "type_ptr" : 116, + "type_ptr" : 117, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 120 + "pointer" : 121 }, { "return_type" : { - "type_ptr" : 117 + "type_ptr" : 118 } }, { "params_type" : [ { - "type_ptr" : 119 + "type_ptr" : 120 } ] } @@ -1390,7 +1396,7 @@ }, { "return_type" : { - "type_ptr" : 118 + "type_ptr" : 119 } }, { @@ -1403,7 +1409,7 @@ ]], ["RValueReferenceType" , [ { - "pointer" : 121 + "pointer" : 122 }, { "type_ptr" : 8 @@ -1414,22 +1420,22 @@ "pointer" : 20 }, { - "type_ptr" : 116 + "type_ptr" : 117 } ]], ["FunctionProtoType" , [ { - "pointer" : 122 + "pointer" : 123 }, { "return_type" : { - "type_ptr" : 117 + "type_ptr" : 118 } }, { "params_type" : [ { - "type_ptr" : 121 + "type_ptr" : 122 } ] } @@ -1440,7 +1446,7 @@ }, { "return_type" : { - "type_ptr" : 118 + "type_ptr" : 119 } }, { @@ -1465,12 +1471,12 @@ ]], ["TemplateTypeParmType" , [ { - "pointer" : 123 + "pointer" : 124 } ]], ["TemplateTypeParmType" , [ { - "pointer" : 124 + "pointer" : 125 } ]], ["FunctionProtoType" , [ @@ -1495,52 +1501,52 @@ ]], ["SubstTemplateTypeParmType" , [ { - "pointer" : 125, + "pointer" : 126, "desugared_type" : 30 } ]], ["SubstTemplateTypeParmType" , [ { - "pointer" : 126, + "pointer" : 127, "desugared_type" : 8 } ]], ["ObjCObjectType" , [ { - "pointer" : 127 + "pointer" : 128 }, { - "base_type" : 100 + "base_type" : 101 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 128 + "pointer" : 129 }, { - "type_ptr" : 127 + "type_ptr" : 128 } ]], ["TypedefType" , [ { - "pointer" : 129, - "desugared_type" : 128 + "pointer" : 130, + "desugared_type" : 129 }, { "child_type" : { - "type_ptr" : 128 + "type_ptr" : 129 }, - "decl_ptr" : 130 + "decl_ptr" : 131 } ]], ["TypedefType" , [ { "pointer" : 45, - "desugared_type" : 128 + "desugared_type" : 129 }, { "child_type" : { - "type_ptr" : 129 + "type_ptr" : 130 }, "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 032ec3f8331..d297ffb065e 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/unresolved_lookup.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/unresolved_lookup.cpp.exp @@ -489,47 +489,53 @@ { "pointer" : 62 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 63 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 64 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 65 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 66 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 67 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 68 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 69 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 69 + "pointer" : 70 }, { "type_ptr" : 10 @@ -537,31 +543,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 70 + "pointer" : 71 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 71 + "pointer" : 72 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 72 + "pointer" : 73 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 73 + "pointer" : 74 }, - 74 + 75 ]], ["PointerType" , [ { - "pointer" : 75 + "pointer" : 76 }, { "type_ptr" : 15, @@ -570,7 +576,7 @@ ]], ["PointerType" , [ { - "pointer" : 76 + "pointer" : 77 }, { "type_ptr" : 12, @@ -579,7 +585,7 @@ ]], ["PointerType" , [ { - "pointer" : 77 + "pointer" : 78 }, { "type_ptr" : 12 @@ -587,33 +593,28 @@ ]], ["RecordType" , [ { - "pointer" : 78 + "pointer" : 79 }, - 79 + 80 ]], ["ConstantArrayType" , [ { - "pointer" : 80 + "pointer" : 81 }, { "element_type" : { - "type_ptr" : 78 + "type_ptr" : 79 }, "stride" : 24 }, 1 ]], - ["TemplateTypeParmType" , [ - { - "pointer" : 81 - } - ]], ["TemplateTypeParmType" , [ { "pointer" : 82 } ]], - ["TemplateSpecializationType" , [ + ["TemplateTypeParmType" , [ { "pointer" : 83 } @@ -623,12 +624,12 @@ "pointer" : 84 } ]], - ["InjectedClassNameType" , [ + ["TemplateSpecializationType" , [ { "pointer" : 85 } ]], - ["TemplateTypeParmType" , [ + ["InjectedClassNameType" , [ { "pointer" : 86 } @@ -638,12 +639,9 @@ "pointer" : 87 } ]], - ["PointerType" , [ + ["TemplateTypeParmType" , [ { "pointer" : 88 - }, - { - "type_ptr" : 86 } ]], ["PointerType" , [ @@ -659,13 +657,21 @@ "pointer" : 90 }, { - "type_ptr" : 85 + "type_ptr" : 88 } ]], - ["FunctionProtoType" , [ + ["PointerType" , [ { "pointer" : 91 }, + { + "type_ptr" : 86 + } + ]], + ["FunctionProtoType" , [ + { + "pointer" : 92 + }, { "return_type" : { "type_ptr" : 15 @@ -674,14 +680,14 @@ { "params_type" : [ { - "type_ptr" : 88 + "type_ptr" : 89 } ] } ]], ["FunctionProtoType" , [ { - "pointer" : 92 + "pointer" : 93 }, { "return_type" : { @@ -691,53 +697,53 @@ { "params_type" : [ { - "type_ptr" : 89 + "type_ptr" : 90 } ] } ]], ["TemplateSpecializationType" , [ { - "pointer" : 93, - "desugared_type" : 85 + "pointer" : 94, + "desugared_type" : 86 } ]], ["ObjCObjectType" , [ { - "pointer" : 94 + "pointer" : 95 }, { - "base_type" : 66 + "base_type" : 67 } ]], ["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" : 9, - "desugared_type" : 95 + "desugared_type" : 96 }, { "child_type" : { - "type_ptr" : 96 + "type_ptr" : 97 }, "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 92a4587c767..dd449ea6bcc 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/using_directive.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/using_directive.cpp.exp @@ -745,47 +745,53 @@ { "pointer" : 69 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 70 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 71 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 72 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 73 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 74 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 75 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 76 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 76 + "pointer" : 77 }, { "type_ptr" : 18 @@ -793,31 +799,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 77 + "pointer" : 78 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 78 + "pointer" : 79 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 79 + "pointer" : 80 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 80 + "pointer" : 81 }, - 81 + 82 ]], ["PointerType" , [ { - "pointer" : 82 + "pointer" : 83 }, { "type_ptr" : 10, @@ -826,7 +832,7 @@ ]], ["PointerType" , [ { - "pointer" : 83 + "pointer" : 84 }, { "type_ptr" : 20, @@ -835,7 +841,7 @@ ]], ["PointerType" , [ { - "pointer" : 84 + "pointer" : 85 }, { "type_ptr" : 20 @@ -843,17 +849,17 @@ ]], ["RecordType" , [ { - "pointer" : 85 + "pointer" : 86 }, - 86 + 87 ]], ["ConstantArrayType" , [ { - "pointer" : 87 + "pointer" : 88 }, { "element_type" : { - "type_ptr" : 85 + "type_ptr" : 86 }, "stride" : 24 }, @@ -861,40 +867,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 88 + "pointer" : 89 }, { - "base_type" : 73 + "base_type" : 74 } ]], ["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" : 17, - "desugared_type" : 89 + "desugared_type" : 90 }, { "child_type" : { - "type_ptr" : 90 + "type_ptr" : 91 }, "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 91219660223..983dcb1beea 100644 --- a/facebook-clang-plugins/libtooling/tests/JsonASTExporter/virtual_bases.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/JsonASTExporter/virtual_bases.cpp.exp @@ -1881,47 +1881,53 @@ { "pointer" : 126 }, - "PseudoObject" + "UnresolvedTemplate" ]], ["BuiltinType" , [ { "pointer" : 127 }, - "UnknownAny" + "PseudoObject" ]], ["BuiltinType" , [ { "pointer" : 128 }, - "ARCUnbridgedCast" + "UnknownAny" ]], ["BuiltinType" , [ { "pointer" : 129 }, - "BuiltinFn" + "ARCUnbridgedCast" ]], ["BuiltinType" , [ { "pointer" : 130 }, - "ObjCId" + "BuiltinFn" ]], ["BuiltinType" , [ { "pointer" : 131 }, - "ObjCClass" + "ObjCId" ]], ["BuiltinType" , [ { "pointer" : 132 }, + "ObjCClass" + ]], + ["BuiltinType" , [ + { + "pointer" : 133 + }, "ObjCSel" ]], ["PointerType" , [ { - "pointer" : 133 + "pointer" : 134 }, { "type_ptr" : 74 @@ -1929,31 +1935,31 @@ ]], ["BuiltinType" , [ { - "pointer" : 134 + "pointer" : 135 }, "NullPtr" ]], ["BuiltinType" , [ { - "pointer" : 135 + "pointer" : 136 }, "Half" ]], ["BuiltinType" , [ { - "pointer" : 136 + "pointer" : 137 }, "BFloat16" ]], ["RecordType" , [ { - "pointer" : 137 + "pointer" : 138 }, - 138 + 139 ]], ["PointerType" , [ { - "pointer" : 139 + "pointer" : 140 }, { "type_ptr" : 79, @@ -1962,7 +1968,7 @@ ]], ["PointerType" , [ { - "pointer" : 140 + "pointer" : 141 }, { "type_ptr" : 76, @@ -1971,7 +1977,7 @@ ]], ["PointerType" , [ { - "pointer" : 141 + "pointer" : 142 }, { "type_ptr" : 76 @@ -1979,17 +1985,17 @@ ]], ["RecordType" , [ { - "pointer" : 142 + "pointer" : 143 }, - 143 + 144 ]], ["ConstantArrayType" , [ { - "pointer" : 144 + "pointer" : 145 }, { "element_type" : { - "type_ptr" : 142 + "type_ptr" : 143 }, "stride" : 24 }, @@ -2003,7 +2009,7 @@ ]], ["PointerType" , [ { - "pointer" : 145 + "pointer" : 146 }, { "type_ptr" : 8 @@ -2029,7 +2035,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 146 + "pointer" : 147 }, { "return_type" : { @@ -2059,7 +2065,7 @@ ]], ["PointerType" , [ { - "pointer" : 147 + "pointer" : 148 }, { "type_ptr" : 24 @@ -2073,7 +2079,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 148 + "pointer" : 149 }, { "return_type" : { @@ -2085,7 +2091,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 149 + "pointer" : 150 }, { "type_ptr" : 24, @@ -2103,7 +2109,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 150 + "pointer" : 151 }, { "return_type" : { @@ -2113,7 +2119,7 @@ { "params_type" : [ { - "type_ptr" : 149 + "type_ptr" : 150 } ] } @@ -2137,7 +2143,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 151 + "pointer" : 152 }, { "type_ptr" : 8, @@ -2155,7 +2161,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 152 + "pointer" : 153 }, { "return_type" : { @@ -2165,7 +2171,7 @@ { "params_type" : [ { - "type_ptr" : 151 + "type_ptr" : 152 } ] } @@ -2189,7 +2195,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 153 + "pointer" : 154 }, { "type_ptr" : 24 @@ -2197,7 +2203,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 154 + "pointer" : 155 }, { "type_ptr" : 61 @@ -2205,17 +2211,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 155 + "pointer" : 156 }, { "return_type" : { - "type_ptr" : 153 + "type_ptr" : 154 } }, { "params_type" : [ { - "type_ptr" : 149 + "type_ptr" : 150 } ] } @@ -2226,7 +2232,7 @@ }, { "return_type" : { - "type_ptr" : 154 + "type_ptr" : 155 } }, { @@ -2239,7 +2245,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 156 + "pointer" : 157 }, { "type_ptr" : 8 @@ -2247,7 +2253,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 157 + "pointer" : 158 }, { "type_ptr" : 28 @@ -2255,17 +2261,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 158 + "pointer" : 159 }, { "return_type" : { - "type_ptr" : 156 + "type_ptr" : 157 } }, { "params_type" : [ { - "type_ptr" : 151 + "type_ptr" : 152 } ] } @@ -2276,7 +2282,7 @@ }, { "return_type" : { - "type_ptr" : 157 + "type_ptr" : 158 } }, { @@ -2289,7 +2295,7 @@ ]], ["PointerType" , [ { - "pointer" : 159 + "pointer" : 160 }, { "type_ptr" : 28 @@ -2303,7 +2309,7 @@ ]], ["PointerType" , [ { - "pointer" : 160 + "pointer" : 161 }, { "type_ptr" : 40 @@ -2317,7 +2323,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 161 + "pointer" : 162 }, { "return_type" : { @@ -2335,7 +2341,7 @@ ]], ["PointerType" , [ { - "pointer" : 162 + "pointer" : 163 }, { "type_ptr" : 54 @@ -2343,13 +2349,13 @@ ]], ["ElaboratedType" , [ { - "pointer" : 163, + "pointer" : 164, "desugared_type" : 54 } ]], ["FunctionProtoType" , [ { - "pointer" : 164 + "pointer" : 165 }, { "return_type" : { @@ -2361,7 +2367,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 165 + "pointer" : 166 }, { "type_ptr" : 54, @@ -2373,13 +2379,13 @@ "pointer" : 68 }, { - "type_ptr" : 163, + "type_ptr" : 164, "is_const" : true } ]], ["FunctionProtoType" , [ { - "pointer" : 166 + "pointer" : 167 }, { "return_type" : { @@ -2389,7 +2395,7 @@ { "params_type" : [ { - "type_ptr" : 165 + "type_ptr" : 166 } ] } @@ -2413,7 +2419,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 167 + "pointer" : 168 }, { "type_ptr" : 40, @@ -2431,7 +2437,7 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 168 + "pointer" : 169 }, { "return_type" : { @@ -2441,7 +2447,7 @@ { "params_type" : [ { - "type_ptr" : 167 + "type_ptr" : 168 } ] } @@ -2465,7 +2471,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 169 + "pointer" : 170 }, { "type_ptr" : 54 @@ -2473,25 +2479,25 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 170 + "pointer" : 171 }, { - "type_ptr" : 163 + "type_ptr" : 164 } ]], ["FunctionProtoType" , [ { - "pointer" : 171 + "pointer" : 172 }, { "return_type" : { - "type_ptr" : 169 + "type_ptr" : 170 } }, { "params_type" : [ { - "type_ptr" : 165 + "type_ptr" : 166 } ] } @@ -2502,7 +2508,7 @@ }, { "return_type" : { - "type_ptr" : 170 + "type_ptr" : 171 } }, { @@ -2515,7 +2521,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 172 + "pointer" : 173 }, { "type_ptr" : 40 @@ -2523,7 +2529,7 @@ ]], ["LValueReferenceType" , [ { - "pointer" : 173 + "pointer" : 174 }, { "type_ptr" : 59 @@ -2531,17 +2537,17 @@ ]], ["FunctionProtoType" , [ { - "pointer" : 174 + "pointer" : 175 }, { "return_type" : { - "type_ptr" : 172 + "type_ptr" : 173 } }, { "params_type" : [ { - "type_ptr" : 167 + "type_ptr" : 168 } ] } @@ -2552,7 +2558,7 @@ }, { "return_type" : { - "type_ptr" : 173 + "type_ptr" : 174 } }, { @@ -2565,7 +2571,7 @@ ]], ["PointerType" , [ { - "pointer" : 175 + "pointer" : 176 }, { "type_ptr" : 59 @@ -2573,7 +2579,7 @@ ]], ["PointerType" , [ { - "pointer" : 176 + "pointer" : 177 }, { "type_ptr" : 61 @@ -2581,40 +2587,40 @@ ]], ["ObjCObjectType" , [ { - "pointer" : 177 + "pointer" : 178 }, { - "base_type" : 130 + "base_type" : 131 } ]], ["ObjCObjectPointerType" , [ { - "pointer" : 178 + "pointer" : 179 }, { - "type_ptr" : 177 + "type_ptr" : 178 } ]], ["TypedefType" , [ { - "pointer" : 179, - "desugared_type" : 178 + "pointer" : 180, + "desugared_type" : 179 }, { "child_type" : { - "type_ptr" : 178 + "type_ptr" : 179 }, - "decl_ptr" : 180 + "decl_ptr" : 181 } ]], ["TypedefType" , [ { "pointer" : 73, - "desugared_type" : 178 + "desugared_type" : 179 }, { "child_type" : { - "type_ptr" : 179 + "type_ptr" : 180 }, "decl_ptr" : 72 } diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/Hello.m.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/Hello.m.exp index e067299eb79..a82670d8409 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/Hello.m.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/Hello.m.exp @@ -3621,47 +3621,53 @@ { "pointer" : 208 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 209 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 210 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 211 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 212 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 213 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 214 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 215 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 215 + "pointer" : 216 }, { "type_ptr" : 104 @@ -3669,77 +3675,77 @@ )>, <"BuiltinType" : ( { - "pointer" : 216 + "pointer" : 217 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 217 + "pointer" : 218 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 218 + "pointer" : 219 }, <"BFloat16"> )>, <"PointerType" : ( { - "pointer" : 219 + "pointer" : 220 }, { - "type_ptr" : 214 + "type_ptr" : 215 } )>, <"ObjCObjectType" : ( { - "pointer" : 220 + "pointer" : 221 }, { - "base_type" : 212 + "base_type" : 213 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 221 + "pointer" : 222 }, { - "type_ptr" : 220 + "type_ptr" : 221 } )>, <"ObjCObjectType" : ( { - "pointer" : 222 + "pointer" : 223 }, { - "base_type" : 213 + "base_type" : 214 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 223 + "pointer" : 224 }, { - "type_ptr" : 222 + "type_ptr" : 223 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 224 + "pointer" : 225 }, 10 )>, <"RecordType" : ( { - "pointer" : 225 + "pointer" : 226 }, - 226 + 227 )>, <"PointerType" : ( { - "pointer" : 227 + "pointer" : 228 }, { "type_ptr" : 56, @@ -3748,7 +3754,7 @@ )>, <"PointerType" : ( { - "pointer" : 228 + "pointer" : 229 }, { "type_ptr" : 162, @@ -3757,7 +3763,7 @@ )>, <"PointerType" : ( { - "pointer" : 229 + "pointer" : 230 }, { "type_ptr" : 162 @@ -3765,17 +3771,17 @@ )>, <"RecordType" : ( { - "pointer" : 230 + "pointer" : 231 }, - 231 + 232 )>, <"ConstantArrayType" : ( { - "pointer" : 232 + "pointer" : 233 }, { "element_type" : { - "type_ptr" : 230 + "type_ptr" : 231 }, "stride" : 24 }, @@ -3783,18 +3789,18 @@ )>, <"ObjCInterfaceType" : ( { - "pointer" : 233 + "pointer" : 234 }, 18 )>, <"TypedefType" : ( { "pointer" : 7, - "desugared_type" : 221 + "desugared_type" : 222 }, { "child_type" : { - "type_ptr" : 221 + "type_ptr" : 222 }, "decl_ptr" : 6 } @@ -3802,7 +3808,7 @@ <"TypedefType" : ( { "pointer" : 21, - "desugared_type" : 221 + "desugared_type" : 222 }, { "child_type" : { @@ -3814,11 +3820,11 @@ <"TypedefType" : ( { "pointer" : 9, - "desugared_type" : 223 + "desugared_type" : 224 }, { "child_type" : { - "type_ptr" : 223 + "type_ptr" : 224 }, "decl_ptr" : 8 } @@ -3826,11 +3832,11 @@ <"TypedefType" : ( { "pointer" : 5, - "desugared_type" : 219 + "desugared_type" : 220 }, { "child_type" : { - "type_ptr" : 219 + "type_ptr" : 220 }, "decl_ptr" : 4 } @@ -3840,13 +3846,13 @@ "pointer" : 30 }, { - "type_ptr" : 233 + "type_ptr" : 234 } )>, <"ElaboratedType" : ( { "pointer" : 39, - "desugared_type" : 223 + "desugared_type" : 224 } )>, <"TypedefType" : ( @@ -3870,7 +3876,7 @@ <"ElaboratedType" : ( { "pointer" : 45, - "desugared_type" : 219 + "desugared_type" : 220 } )>, <"ObjCObjectPointerType" : ( @@ -3878,18 +3884,18 @@ "pointer" : 50 }, { - "type_ptr" : 224 + "type_ptr" : 225 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 234 + "pointer" : 235 }, 53 )>, <"ObjCInterfaceType" : ( { - "pointer" : 235 + "pointer" : 236 }, 59 )>, @@ -3916,35 +3922,35 @@ "pointer" : 63 }, { - "type_ptr" : 235 + "type_ptr" : 236 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 236 + "pointer" : 237 }, 65 )>, <"ElaboratedType" : ( { "pointer" : 74, - "desugared_type" : 221 + "desugared_type" : 222 } )>, <"IncompleteArrayType" : ( { - "pointer" : 237 + "pointer" : 238 }, { "element_type" : { - "type_ptr" : 221 + "type_ptr" : 222 }, "stride" : 8 } )>, <"IncompleteArrayType" : ( { - "pointer" : 238 + "pointer" : 239 }, { "element_type" : { @@ -3956,7 +3962,7 @@ )>, <"IncompleteArrayType" : ( { - "pointer" : 239 + "pointer" : 240 }, { "element_type" : { @@ -3968,16 +3974,16 @@ )>, <"PointerType" : ( { - "pointer" : 240 + "pointer" : 241 }, { - "type_ptr" : 221, + "type_ptr" : 222, "is_const" : true } )>, <"PointerType" : ( { - "pointer" : 241 + "pointer" : 242 }, { "type_ptr" : 74, @@ -3987,10 +3993,10 @@ <"DecayedType" : ( { "pointer" : 68, - "desugared_type" : 241 + "desugared_type" : 242 }, { - "type_ptr" : 241 + "type_ptr" : 242 } )>, <"ObjCObjectPointerType" : ( @@ -3998,21 +4004,21 @@ "pointer" : 77 }, { - "type_ptr" : 236 + "type_ptr" : 237 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 242 + "pointer" : 243 }, 79 )>, <"PointerType" : ( { - "pointer" : 243 + "pointer" : 244 }, { - "type_ptr" : 221 + "type_ptr" : 222 } )>, <"PointerType" : ( @@ -4028,18 +4034,18 @@ "pointer" : 90 }, { - "type_ptr" : 242 + "type_ptr" : 243 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 244 + "pointer" : 245 }, 92 )>, <"FunctionProtoType" : ( { - "pointer" : 245 + "pointer" : 246 }, { "return_type" : { @@ -4056,7 +4062,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 246 + "pointer" : 247 }, { "return_type" : { @@ -4073,7 +4079,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 247 + "pointer" : 248 }, { "return_type" : { @@ -4083,7 +4089,7 @@ { "params_type" : [ { - "type_ptr" : 221 + "type_ptr" : 222 } ] } @@ -4133,10 +4139,10 @@ )>, <"PointerType" : ( { - "pointer" : 248 + "pointer" : 249 }, { - "type_ptr" : 247 + "type_ptr" : 248 } )>, <"PointerType" : ( @@ -4149,35 +4155,35 @@ )>, <"IncompleteArrayType" : ( { - "pointer" : 249 + "pointer" : 250 }, { "element_type" : { - "type_ptr" : 229 + "type_ptr" : 230 }, "stride" : 8 } )>, <"PointerType" : ( { - "pointer" : 250 + "pointer" : 251 }, { - "type_ptr" : 229 + "type_ptr" : 230 } )>, <"DecayedType" : ( { "pointer" : 135, - "desugared_type" : 250 + "desugared_type" : 251 }, { - "type_ptr" : 250 + "type_ptr" : 251 } )>, <"FunctionProtoType" : ( { - "pointer" : 251 + "pointer" : 252 }, { "return_type" : { @@ -4190,7 +4196,7 @@ "type_ptr" : 56 }, { - "type_ptr" : 250 + "type_ptr" : 251 } ] } diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCBridgeTransferTest.m.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCBridgeTransferTest.m.exp index b4d0fa5dd20..9b230d6050e 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCBridgeTransferTest.m.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCBridgeTransferTest.m.exp @@ -2966,47 +2966,53 @@ { "pointer" : 176 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 177 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 178 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 179 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 180 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 181 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 182 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 183 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 183 + "pointer" : 184 }, { "type_ptr" : 112 @@ -3014,77 +3020,77 @@ )>, <"BuiltinType" : ( { - "pointer" : 184 + "pointer" : 185 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 185 + "pointer" : 186 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 186 + "pointer" : 187 }, <"BFloat16"> )>, <"PointerType" : ( { - "pointer" : 187 + "pointer" : 188 }, { - "type_ptr" : 182 + "type_ptr" : 183 } )>, <"ObjCObjectType" : ( { - "pointer" : 188 + "pointer" : 189 }, { - "base_type" : 180 + "base_type" : 181 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 189 + "pointer" : 190 }, { - "type_ptr" : 188 + "type_ptr" : 189 } )>, <"ObjCObjectType" : ( { - "pointer" : 190 + "pointer" : 191 }, { - "base_type" : 181 + "base_type" : 182 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 191 + "pointer" : 192 }, { - "type_ptr" : 190 + "type_ptr" : 191 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 192 + "pointer" : 193 }, 10 )>, <"RecordType" : ( { - "pointer" : 193 + "pointer" : 194 }, - 194 + 195 )>, <"PointerType" : ( { - "pointer" : 195 + "pointer" : 196 }, { "type_ptr" : 56, @@ -3093,7 +3099,7 @@ )>, <"PointerType" : ( { - "pointer" : 196 + "pointer" : 197 }, { "type_ptr" : 130, @@ -3102,7 +3108,7 @@ )>, <"PointerType" : ( { - "pointer" : 197 + "pointer" : 198 }, { "type_ptr" : 130 @@ -3110,17 +3116,17 @@ )>, <"RecordType" : ( { - "pointer" : 198 + "pointer" : 199 }, - 199 + 200 )>, <"ConstantArrayType" : ( { - "pointer" : 200 + "pointer" : 201 }, { "element_type" : { - "type_ptr" : 198 + "type_ptr" : 199 }, "stride" : 24 }, @@ -3128,18 +3134,18 @@ )>, <"ObjCInterfaceType" : ( { - "pointer" : 201 + "pointer" : 202 }, 18 )>, <"TypedefType" : ( { "pointer" : 7, - "desugared_type" : 189 + "desugared_type" : 190 }, { "child_type" : { - "type_ptr" : 189 + "type_ptr" : 190 }, "decl_ptr" : 6 } @@ -3147,7 +3153,7 @@ <"TypedefType" : ( { "pointer" : 21, - "desugared_type" : 189 + "desugared_type" : 190 }, { "child_type" : { @@ -3159,11 +3165,11 @@ <"TypedefType" : ( { "pointer" : 9, - "desugared_type" : 191 + "desugared_type" : 192 }, { "child_type" : { - "type_ptr" : 191 + "type_ptr" : 192 }, "decl_ptr" : 8 } @@ -3171,11 +3177,11 @@ <"TypedefType" : ( { "pointer" : 5, - "desugared_type" : 187 + "desugared_type" : 188 }, { "child_type" : { - "type_ptr" : 187 + "type_ptr" : 188 }, "decl_ptr" : 4 } @@ -3185,13 +3191,13 @@ "pointer" : 30 }, { - "type_ptr" : 201 + "type_ptr" : 202 } )>, <"ElaboratedType" : ( { "pointer" : 39, - "desugared_type" : 191 + "desugared_type" : 192 } )>, <"TypedefType" : ( @@ -3215,7 +3221,7 @@ <"ElaboratedType" : ( { "pointer" : 45, - "desugared_type" : 187 + "desugared_type" : 188 } )>, <"ObjCObjectPointerType" : ( @@ -3223,18 +3229,18 @@ "pointer" : 50 }, { - "type_ptr" : 192 + "type_ptr" : 193 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 202 + "pointer" : 203 }, 53 )>, <"ObjCInterfaceType" : ( { - "pointer" : 203 + "pointer" : 204 }, 59 )>, @@ -3261,35 +3267,35 @@ "pointer" : 63 }, { - "type_ptr" : 203 + "type_ptr" : 204 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 204 + "pointer" : 205 }, 65 )>, <"ElaboratedType" : ( { "pointer" : 74, - "desugared_type" : 189 + "desugared_type" : 190 } )>, <"IncompleteArrayType" : ( { - "pointer" : 205 + "pointer" : 206 }, { "element_type" : { - "type_ptr" : 189 + "type_ptr" : 190 }, "stride" : 8 } )>, <"IncompleteArrayType" : ( { - "pointer" : 206 + "pointer" : 207 }, { "element_type" : { @@ -3301,7 +3307,7 @@ )>, <"IncompleteArrayType" : ( { - "pointer" : 207 + "pointer" : 208 }, { "element_type" : { @@ -3313,16 +3319,16 @@ )>, <"PointerType" : ( { - "pointer" : 208 + "pointer" : 209 }, { - "type_ptr" : 189, + "type_ptr" : 190, "is_const" : true } )>, <"PointerType" : ( { - "pointer" : 209 + "pointer" : 210 }, { "type_ptr" : 74, @@ -3332,10 +3338,10 @@ <"DecayedType" : ( { "pointer" : 68, - "desugared_type" : 209 + "desugared_type" : 210 }, { - "type_ptr" : 209 + "type_ptr" : 210 } )>, <"ObjCObjectPointerType" : ( @@ -3343,21 +3349,21 @@ "pointer" : 77 }, { - "type_ptr" : 204 + "type_ptr" : 205 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 210 + "pointer" : 211 }, 79 )>, <"PointerType" : ( { - "pointer" : 211 + "pointer" : 212 }, { - "type_ptr" : 189 + "type_ptr" : 190 } )>, <"PointerType" : ( @@ -3373,18 +3379,18 @@ "pointer" : 90 }, { - "type_ptr" : 210 + "type_ptr" : 211 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 212 + "pointer" : 213 }, 92 )>, <"FunctionProtoType" : ( { - "pointer" : 213 + "pointer" : 214 }, { "return_type" : { @@ -3401,7 +3407,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 214 + "pointer" : 215 }, { "return_type" : { @@ -3418,7 +3424,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 215 + "pointer" : 216 }, { "return_type" : { @@ -3428,7 +3434,7 @@ { "params_type" : [ { - "type_ptr" : 189 + "type_ptr" : 190 } ] } @@ -3458,13 +3464,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 216, + "pointer" : 217, "desugared_type" : 103 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 217 + "pointer" : 218 }, 106 )>, @@ -3475,20 +3481,20 @@ }, { "child_type" : { - "type_ptr" : 216 + "type_ptr" : 217 }, "decl_ptr" : 104 } )>, <"ElaboratedType" : ( { - "pointer" : 218, + "pointer" : 219, "desugared_type" : 103 } )>, <"PointerType" : ( { - "pointer" : 219 + "pointer" : 220 }, { "type_ptr" : 103 @@ -3499,16 +3505,16 @@ "pointer" : 125 }, { - "type_ptr" : 218 + "type_ptr" : 219 } )>, <"FunctionNoProtoType" : ( { - "pointer" : 220 + "pointer" : 221 }, { "return_type" : { - "type_ptr" : 219 + "type_ptr" : 220 } } )>, @@ -3524,7 +3530,7 @@ )>, <"ObjCInterfaceType" : ( { - "pointer" : 221 + "pointer" : 222 }, 109 )>, @@ -3533,7 +3539,7 @@ "pointer" : 114 }, { - "type_ptr" : 221 + "type_ptr" : 222 } )>, <"ObjCObjectPointerType" : ( @@ -3541,15 +3547,15 @@ "pointer" : 126 }, { - "type_ptr" : 217 + "type_ptr" : 218 } )>, <"PointerType" : ( { - "pointer" : 222 + "pointer" : 223 }, { - "type_ptr" : 220 + "type_ptr" : 221 } )>, <"PointerType" : ( diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCTest.m.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCTest.m.exp index 4eebd9deaed..e2991dbd33d 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCTest.m.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/ObjCTest.m.exp @@ -14221,6 +14221,12 @@ }, <"BoundMember"> )>, + <"BuiltinType" : ( + { + "pointer" : 473 + }, + <"UnresolvedTemplate"> + )>, <"BuiltinType" : ( { "pointer" : 212 @@ -14229,37 +14235,37 @@ )>, <"BuiltinType" : ( { - "pointer" : 473 + "pointer" : 474 }, <"UnknownAny"> )>, <"BuiltinType" : ( { - "pointer" : 474 + "pointer" : 475 }, <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { - "pointer" : 475 + "pointer" : 476 }, <"BuiltinFn"> )>, <"BuiltinType" : ( { - "pointer" : 476 + "pointer" : 477 }, <"ObjCId"> )>, <"BuiltinType" : ( { - "pointer" : 477 + "pointer" : 478 }, <"ObjCClass"> )>, <"BuiltinType" : ( { - "pointer" : 478 + "pointer" : 479 }, <"ObjCSel"> )>, @@ -14273,77 +14279,77 @@ )>, <"BuiltinType" : ( { - "pointer" : 479 + "pointer" : 480 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 480 + "pointer" : 481 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 481 + "pointer" : 482 }, <"BFloat16"> )>, <"PointerType" : ( { - "pointer" : 482 + "pointer" : 483 }, { - "type_ptr" : 478 + "type_ptr" : 479 } )>, <"ObjCObjectType" : ( { - "pointer" : 483 + "pointer" : 484 }, { - "base_type" : 476 + "base_type" : 477 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 484 + "pointer" : 485 }, { - "type_ptr" : 483 + "type_ptr" : 484 } )>, <"ObjCObjectType" : ( { - "pointer" : 485 + "pointer" : 486 }, { - "base_type" : 477 + "base_type" : 478 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 486 + "pointer" : 487 }, { - "type_ptr" : 485 + "type_ptr" : 486 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 487 + "pointer" : 488 }, 10 )>, <"RecordType" : ( { - "pointer" : 488 + "pointer" : 489 }, - 489 + 490 )>, <"PointerType" : ( { - "pointer" : 490 + "pointer" : 491 }, { "type_ptr" : 56, @@ -14352,7 +14358,7 @@ )>, <"PointerType" : ( { - "pointer" : 491 + "pointer" : 492 }, { "type_ptr" : 427, @@ -14369,17 +14375,17 @@ )>, <"RecordType" : ( { - "pointer" : 492 + "pointer" : 493 }, - 493 + 494 )>, <"ConstantArrayType" : ( { - "pointer" : 494 + "pointer" : 495 }, { "element_type" : { - "type_ptr" : 492 + "type_ptr" : 493 }, "stride" : 24 }, @@ -14387,18 +14393,18 @@ )>, <"ObjCInterfaceType" : ( { - "pointer" : 495 + "pointer" : 496 }, 18 )>, <"TypedefType" : ( { "pointer" : 7, - "desugared_type" : 484 + "desugared_type" : 485 }, { "child_type" : { - "type_ptr" : 484 + "type_ptr" : 485 }, "decl_ptr" : 6 } @@ -14406,7 +14412,7 @@ <"TypedefType" : ( { "pointer" : 21, - "desugared_type" : 484 + "desugared_type" : 485 }, { "child_type" : { @@ -14418,11 +14424,11 @@ <"TypedefType" : ( { "pointer" : 9, - "desugared_type" : 486 + "desugared_type" : 487 }, { "child_type" : { - "type_ptr" : 486 + "type_ptr" : 487 }, "decl_ptr" : 8 } @@ -14430,11 +14436,11 @@ <"TypedefType" : ( { "pointer" : 5, - "desugared_type" : 482 + "desugared_type" : 483 }, { "child_type" : { - "type_ptr" : 482 + "type_ptr" : 483 }, "decl_ptr" : 4 } @@ -14444,13 +14450,13 @@ "pointer" : 30 }, { - "type_ptr" : 495 + "type_ptr" : 496 } )>, <"ElaboratedType" : ( { "pointer" : 39, - "desugared_type" : 486 + "desugared_type" : 487 } )>, <"TypedefType" : ( @@ -14474,7 +14480,7 @@ <"ElaboratedType" : ( { "pointer" : 45, - "desugared_type" : 482 + "desugared_type" : 483 } )>, <"ObjCObjectPointerType" : ( @@ -14482,18 +14488,18 @@ "pointer" : 50 }, { - "type_ptr" : 487 + "type_ptr" : 488 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 496 + "pointer" : 497 }, 53 )>, <"ObjCInterfaceType" : ( { - "pointer" : 497 + "pointer" : 498 }, 59 )>, @@ -14520,35 +14526,35 @@ "pointer" : 63 }, { - "type_ptr" : 497 + "type_ptr" : 498 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 498 + "pointer" : 499 }, 65 )>, <"ElaboratedType" : ( { "pointer" : 74, - "desugared_type" : 484 + "desugared_type" : 485 } )>, <"IncompleteArrayType" : ( { - "pointer" : 499 + "pointer" : 500 }, { "element_type" : { - "type_ptr" : 484 + "type_ptr" : 485 }, "stride" : 8 } )>, <"IncompleteArrayType" : ( { - "pointer" : 500 + "pointer" : 501 }, { "element_type" : { @@ -14560,7 +14566,7 @@ )>, <"IncompleteArrayType" : ( { - "pointer" : 501 + "pointer" : 502 }, { "element_type" : { @@ -14572,16 +14578,16 @@ )>, <"PointerType" : ( { - "pointer" : 502 + "pointer" : 503 }, { - "type_ptr" : 484, + "type_ptr" : 485, "is_const" : true } )>, <"PointerType" : ( { - "pointer" : 503 + "pointer" : 504 }, { "type_ptr" : 74, @@ -14591,10 +14597,10 @@ <"DecayedType" : ( { "pointer" : 68, - "desugared_type" : 503 + "desugared_type" : 504 }, { - "type_ptr" : 503 + "type_ptr" : 504 } )>, <"ObjCObjectPointerType" : ( @@ -14602,21 +14608,21 @@ "pointer" : 77 }, { - "type_ptr" : 498 + "type_ptr" : 499 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 504 + "pointer" : 505 }, 79 )>, <"PointerType" : ( { - "pointer" : 505 + "pointer" : 506 }, { - "type_ptr" : 484 + "type_ptr" : 485 } )>, <"PointerType" : ( @@ -14632,18 +14638,18 @@ "pointer" : 90 }, { - "type_ptr" : 504 + "type_ptr" : 505 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 506 + "pointer" : 507 }, 92 )>, <"FunctionProtoType" : ( { - "pointer" : 507 + "pointer" : 508 }, { "return_type" : { @@ -14660,7 +14666,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 508 + "pointer" : 509 }, { "return_type" : { @@ -14677,7 +14683,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 509 + "pointer" : 510 }, { "return_type" : { @@ -14687,7 +14693,7 @@ { "params_type" : [ { - "type_ptr" : 484 + "type_ptr" : 485 } ] } @@ -14717,10 +14723,10 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 510 + "pointer" : 511 }, { - "base_type" : 495, + "base_type" : 496, "protocol_decls_ptr" : [ 112 ] @@ -14731,7 +14737,7 @@ "pointer" : 128 }, { - "type_ptr" : 510 + "type_ptr" : 511 } )>, <"ObjCObjectPointerType" : ( @@ -14765,7 +14771,7 @@ )>, <"PointerType" : ( { - "pointer" : 511 + "pointer" : 512 }, { "type_ptr" : 56 @@ -14776,15 +14782,15 @@ "pointer" : 176 }, { - "type_ptr" : 511 + "type_ptr" : 512 } )>, <"PointerType" : ( { - "pointer" : 512 + "pointer" : 513 }, { - "type_ptr" : 509 + "type_ptr" : 510 } )>, <"PointerType" : ( @@ -14797,7 +14803,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 513 + "pointer" : 514 }, { "return_type" : { @@ -14814,7 +14820,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 514 + "pointer" : 515 }, { "return_type" : { @@ -14831,19 +14837,19 @@ )>, <"ParenType" : ( { - "pointer" : 515, - "desugared_type" : 514 + "pointer" : 516, + "desugared_type" : 515 }, { - "type_ptr" : 514 + "type_ptr" : 515 } )>, <"BlockPointerType" : ( { - "pointer" : 516 + "pointer" : 517 }, { - "type_ptr" : 513 + "type_ptr" : 514 } )>, <"BlockPointerType" : ( @@ -14851,12 +14857,12 @@ "pointer" : 224 }, { - "type_ptr" : 515 + "type_ptr" : 516 } )>, <"FunctionProtoType" : ( { - "pointer" : 517 + "pointer" : 518 }, { "return_type" : { @@ -14873,7 +14879,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 518 + "pointer" : 519 }, { "return_type" : { @@ -14893,7 +14899,7 @@ "pointer" : 202 }, { - "type_ptr" : 514 + "type_ptr" : 515 } )>, <"ObjCObjectPointerType" : ( @@ -14901,7 +14907,7 @@ "pointer" : 235 }, { - "type_ptr" : 496 + "type_ptr" : 497 } )>, <"ConstantArrayType" : ( @@ -14921,7 +14927,7 @@ "pointer" : 296 }, { - "type_ptr" : 506 + "type_ptr" : 507 } )>, <"ConstantArrayType" : ( @@ -14962,28 +14968,28 @@ )>, <"ObjCTypeParamType" : ( { - "pointer" : 519, - "desugared_type" : 484 + "pointer" : 520, + "desugared_type" : 485 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 520 + "pointer" : 521 }, 372 )>, <"ObjCInterfaceType" : ( { - "pointer" : 521 + "pointer" : 522 }, 373 )>, <"ObjCObjectType" : ( { - "pointer" : 522 + "pointer" : 523 }, { - "base_type" : 520, + "base_type" : 521, "type_args" : [ { "type_ptr" : 30 @@ -14996,12 +15002,12 @@ "pointer" : 377 }, { - "type_ptr" : 522 + "type_ptr" : 523 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 523 + "pointer" : 524 }, 380 )>, @@ -15010,7 +15016,7 @@ "pointer" : 385 }, { - "type_ptr" : 523 + "type_ptr" : 524 } )>, <"PointerType" : ( 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 1c23a79da21..893e1c05dec 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/available_expression.m.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/available_expression.m.exp @@ -984,47 +984,53 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem { "pointer" : 82 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 83 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 84 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 85 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 86 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 87 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 88 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 89 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 89 + "pointer" : 90 }, { "type_ptr" : 18 @@ -1032,77 +1038,77 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem )>, <"BuiltinType" : ( { - "pointer" : 90 + "pointer" : 91 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 91 + "pointer" : 92 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 92 + "pointer" : 93 }, <"BFloat16"> )>, <"PointerType" : ( { - "pointer" : 93 + "pointer" : 94 }, { - "type_ptr" : 88 + "type_ptr" : 89 } )>, <"ObjCObjectType" : ( { - "pointer" : 94 + "pointer" : 95 }, { - "base_type" : 86 + "base_type" : 87 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 95 + "pointer" : 96 }, { - "type_ptr" : 94 + "type_ptr" : 95 } )>, <"ObjCObjectType" : ( { - "pointer" : 96 + "pointer" : 97 }, { - "base_type" : 87 + "base_type" : 88 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 97 + "pointer" : 98 }, { - "type_ptr" : 96 + "type_ptr" : 97 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 98 + "pointer" : 99 }, 9 )>, <"RecordType" : ( { - "pointer" : 99 + "pointer" : 100 }, - 100 + 101 )>, <"PointerType" : ( { - "pointer" : 101 + "pointer" : 102 }, { "type_ptr" : 20, @@ -1111,7 +1117,7 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem )>, <"PointerType" : ( { - "pointer" : 102 + "pointer" : 103 }, { "type_ptr" : 35, @@ -1120,7 +1126,7 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem )>, <"PointerType" : ( { - "pointer" : 103 + "pointer" : 104 }, { "type_ptr" : 35 @@ -1128,17 +1134,17 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem )>, <"RecordType" : ( { - "pointer" : 104 + "pointer" : 105 }, - 105 + 106 )>, <"ConstantArrayType" : ( { - "pointer" : 106 + "pointer" : 107 }, { "element_type" : { - "type_ptr" : 104 + "type_ptr" : 105 }, "stride" : 24 }, @@ -1146,13 +1152,13 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem )>, <"ObjCInterfaceType" : ( { - "pointer" : 107 + "pointer" : 108 }, 13 )>, <"ObjCInterfaceType" : ( { - "pointer" : 108 + "pointer" : 109 }, 15 )>, @@ -1161,17 +1167,17 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem "pointer" : 22 }, { - "type_ptr" : 108 + "type_ptr" : 109 } )>, <"TypedefType" : ( { "pointer" : 7, - "desugared_type" : 95 + "desugared_type" : 96 }, { "child_type" : { - "type_ptr" : 95 + "type_ptr" : 96 }, "decl_ptr" : 6 } @@ -1179,7 +1185,7 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem <"TypedefType" : ( { "pointer" : 34, - "desugared_type" : 95 + "desugared_type" : 96 }, { "child_type" : { @@ -1191,11 +1197,11 @@ tests/available_expression.m:8:20: note: add a super class to fix this problem <"TypedefType" : ( { "pointer" : 5, - "desugared_type" : 93 + "desugared_type" : 94 }, { "child_type" : { - "type_ptr" : 93 + "type_ptr" : 94 }, "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 dbba4b0b159..f81508950b2 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/bind_temporary.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/bind_temporary.cpp.exp @@ -1109,47 +1109,53 @@ { "pointer" : 86 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 87 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 88 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 89 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 90 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 91 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 92 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 93 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 93 + "pointer" : 94 }, { "type_ptr" : 34 @@ -1157,31 +1163,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 94 + "pointer" : 95 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 95 + "pointer" : 96 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 96 + "pointer" : 97 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 97 + "pointer" : 98 }, - 98 + 99 )>, <"PointerType" : ( { - "pointer" : 99 + "pointer" : 100 }, { "type_ptr" : 39, @@ -1190,7 +1196,7 @@ )>, <"PointerType" : ( { - "pointer" : 100 + "pointer" : 101 }, { "type_ptr" : 36, @@ -1199,7 +1205,7 @@ )>, <"PointerType" : ( { - "pointer" : 101 + "pointer" : 102 }, { "type_ptr" : 36 @@ -1207,17 +1213,17 @@ )>, <"RecordType" : ( { - "pointer" : 102 + "pointer" : 103 }, - 103 + 104 )>, <"ConstantArrayType" : ( { - "pointer" : 104 + "pointer" : 105 }, { "element_type" : { - "type_ptr" : 102 + "type_ptr" : 103 }, "stride" : 24 }, @@ -1231,7 +1237,7 @@ )>, <"PointerType" : ( { - "pointer" : 105 + "pointer" : 106 }, { "type_ptr" : 8 @@ -1257,7 +1263,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 106 + "pointer" : 107 }, { "return_type" : { @@ -1281,7 +1287,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 107 + "pointer" : 108 }, { "type_ptr" : 8, @@ -1299,7 +1305,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 108 + "pointer" : 109 }, { "return_type" : { @@ -1309,7 +1315,7 @@ { "params_type" : [ { - "type_ptr" : 107 + "type_ptr" : 108 } ] } @@ -1333,7 +1339,7 @@ )>, <"PointerType" : ( { - "pointer" : 109 + "pointer" : 110 }, { "type_ptr" : 29 @@ -1341,7 +1347,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 110 + "pointer" : 111 }, { "type_ptr" : 8 @@ -1349,40 +1355,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 111 + "pointer" : 112 }, { - "base_type" : 90 + "base_type" : 91 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 112 + "pointer" : 113 }, { - "type_ptr" : 111 + "type_ptr" : 112 } )>, <"TypedefType" : ( { - "pointer" : 113, - "desugared_type" : 112 + "pointer" : 114, + "desugared_type" : 113 }, { "child_type" : { - "type_ptr" : 112 + "type_ptr" : 113 }, - "decl_ptr" : 114 + "decl_ptr" : 115 } )>, <"TypedefType" : ( { "pointer" : 33, - "desugared_type" : 112 + "desugared_type" : 113 }, { "child_type" : { - "type_ptr" : 113 + "type_ptr" : 114 }, "decl_ptr" : 32 } 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 17807299be0..8dbab897571 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_attributes.c.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_attributes.c.exp @@ -527,47 +527,53 @@ { "pointer" : 63 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 64 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 65 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 66 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 67 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 68 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 69 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 70 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 70 + "pointer" : 71 }, { "type_ptr" : 14 @@ -575,31 +581,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 71 + "pointer" : 72 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 72 + "pointer" : 73 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 73 + "pointer" : 74 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 74 + "pointer" : 75 }, - 75 + 76 )>, <"PointerType" : ( { - "pointer" : 76 + "pointer" : 77 }, { "type_ptr" : 11, @@ -608,7 +614,7 @@ )>, <"PointerType" : ( { - "pointer" : 77 + "pointer" : 78 }, { "type_ptr" : 16, @@ -617,7 +623,7 @@ )>, <"PointerType" : ( { - "pointer" : 78 + "pointer" : 79 }, { "type_ptr" : 16 @@ -625,17 +631,17 @@ )>, <"RecordType" : ( { - "pointer" : 79 + "pointer" : 80 }, - 80 + 81 )>, <"ConstantArrayType" : ( { - "pointer" : 81 + "pointer" : 82 }, { "element_type" : { - "type_ptr" : 79 + "type_ptr" : 80 }, "stride" : 24 }, @@ -660,40 +666,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 82 + "pointer" : 83 }, { - "base_type" : 67 + "base_type" : 68 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 83 + "pointer" : 84 }, { - "type_ptr" : 82 + "type_ptr" : 83 } )>, <"TypedefType" : ( { - "pointer" : 84, - "desugared_type" : 83 + "pointer" : 85, + "desugared_type" : 84 }, { "child_type" : { - "type_ptr" : 83 + "type_ptr" : 84 }, - "decl_ptr" : 85 + "decl_ptr" : 86 } )>, <"TypedefType" : ( { "pointer" : 13, - "desugared_type" : 83 + "desugared_type" : 84 }, { "child_type" : { - "type_ptr" : 84 + "type_ptr" : 85 }, "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 e79578962e9..25b4629a16c 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_cast.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/c_cast.cpp.exp @@ -791,47 +791,53 @@ { "pointer" : 73 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 74 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 75 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 76 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 77 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 78 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 79 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 80 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 80 + "pointer" : 81 }, { "type_ptr" : 23 @@ -839,31 +845,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 81 + "pointer" : 82 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 82 + "pointer" : 83 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 83 + "pointer" : 84 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 84 + "pointer" : 85 }, - 85 + 86 )>, <"PointerType" : ( { - "pointer" : 86 + "pointer" : 87 }, { "type_ptr" : 8, @@ -872,7 +878,7 @@ )>, <"PointerType" : ( { - "pointer" : 87 + "pointer" : 88 }, { "type_ptr" : 25, @@ -881,7 +887,7 @@ )>, <"PointerType" : ( { - "pointer" : 88 + "pointer" : 89 }, { "type_ptr" : 25 @@ -889,17 +895,17 @@ )>, <"RecordType" : ( { - "pointer" : 89 + "pointer" : 90 }, - 90 + 91 )>, <"ConstantArrayType" : ( { - "pointer" : 91 + "pointer" : 92 }, { "element_type" : { - "type_ptr" : 89 + "type_ptr" : 90 }, "stride" : 24 }, @@ -907,40 +913,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 92 + "pointer" : 93 }, { - "base_type" : 77 + "base_type" : 78 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 93 + "pointer" : 94 }, { - "type_ptr" : 92 + "type_ptr" : 93 } )>, <"TypedefType" : ( { - "pointer" : 94, - "desugared_type" : 93 + "pointer" : 95, + "desugared_type" : 94 }, { "child_type" : { - "type_ptr" : 93 + "type_ptr" : 94 }, - "decl_ptr" : 95 + "decl_ptr" : 96 } )>, <"TypedefType" : ( { "pointer" : 22, - "desugared_type" : 93 + "desugared_type" : 94 }, { "child_type" : { - "type_ptr" : 94 + "type_ptr" : 95 }, "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 b7ffd3d546d..92453b658ff 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/class_template.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/class_template.cpp.exp @@ -2109,47 +2109,53 @@ { "pointer" : 137 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 138 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 139 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 140 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 141 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 142 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 143 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 144 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 144 + "pointer" : 145 }, { "type_ptr" : 86 @@ -2157,31 +2163,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 145 + "pointer" : 146 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 146 + "pointer" : 147 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 147 + "pointer" : 148 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 148 + "pointer" : 149 }, - 149 + 150 )>, <"PointerType" : ( { - "pointer" : 150 + "pointer" : 151 }, { "type_ptr" : 38, @@ -2190,7 +2196,7 @@ )>, <"PointerType" : ( { - "pointer" : 151 + "pointer" : 152 }, { "type_ptr" : 88, @@ -2199,7 +2205,7 @@ )>, <"PointerType" : ( { - "pointer" : 152 + "pointer" : 153 }, { "type_ptr" : 88 @@ -2207,17 +2213,17 @@ )>, <"RecordType" : ( { - "pointer" : 153 + "pointer" : 154 }, - 154 + 155 )>, <"ConstantArrayType" : ( { - "pointer" : 155 + "pointer" : 156 }, { "element_type" : { - "type_ptr" : 153 + "type_ptr" : 154 }, "stride" : 24 }, @@ -2225,27 +2231,27 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 156 + "pointer" : 157 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 157 + "pointer" : 158 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 158 + "pointer" : 159 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 159 + "pointer" : 160 } )>, <"InjectedClassNameType" : ( { - "pointer" : 160 + "pointer" : 161 } )>, <"TemplateTypeParmType" : ( @@ -2258,12 +2264,12 @@ "pointer" : 33 }, { - "type_ptr" : 156 + "type_ptr" : 157 } )>, <"PointerType" : ( { - "pointer" : 161 + "pointer" : 162 }, { "type_ptr" : 32 @@ -2271,12 +2277,12 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 162 + "pointer" : 163 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 163 + "pointer" : 164 } )>, <"InjectedClassNameType" : ( @@ -2284,11 +2290,6 @@ "pointer" : 29 } )>, - <"TemplateSpecializationType" : ( - { - "pointer" : 164 - } - )>, <"RecordType" : ( { "pointer" : 35 @@ -2301,12 +2302,6 @@ "desugared_type" : 35 } )>, - <"TemplateSpecializationType" : ( - { - "pointer" : 166, - "desugared_type" : 35 - } - )>, <"ElaboratedType" : ( { "pointer" : 70, @@ -2315,7 +2310,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 167 + "pointer" : 166 }, { "return_type" : { @@ -2349,13 +2344,13 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 168, + "pointer" : 167, "desugared_type" : 35 } )>, <"ElaboratedType" : ( { - "pointer" : 169, + "pointer" : 168, "desugared_type" : 35 } )>, @@ -2369,10 +2364,10 @@ )>, <"PointerType" : ( { - "pointer" : 170 + "pointer" : 169 }, { - "type_ptr" : 169 + "type_ptr" : 168 } )>, <"RecordType" : ( @@ -2383,7 +2378,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 171, + "pointer" : 170, "desugared_type" : 10 } )>, @@ -2401,7 +2396,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 172 + "pointer" : 171 }, { "return_type" : { @@ -2413,7 +2408,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 173 + "pointer" : 172 }, { "return_type" : { @@ -2425,7 +2420,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 174 + "pointer" : 173 }, { "return_type" : { @@ -2449,13 +2444,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 175, + "pointer" : 174, "desugared_type" : 10 } )>, <"LValueReferenceType" : ( { - "pointer" : 176 + "pointer" : 175 }, { "type_ptr" : 10, @@ -2467,7 +2462,7 @@ "pointer" : 22 }, { - "type_ptr" : 175, + "type_ptr" : 174, "is_const" : true } )>, @@ -2479,7 +2474,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 177 + "pointer" : 176 }, { "type_ptr" : 35, @@ -2497,7 +2492,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 178 + "pointer" : 177 }, { "return_type" : { @@ -2507,7 +2502,7 @@ { "params_type" : [ { - "type_ptr" : 177 + "type_ptr" : 176 } ] } @@ -2531,7 +2526,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 179 + "pointer" : 178 }, { "type_ptr" : 35 @@ -2547,7 +2542,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 180 + "pointer" : 179 }, { "return_type" : { @@ -2557,7 +2552,7 @@ { "params_type" : [ { - "type_ptr" : 179 + "type_ptr" : 178 } ] } @@ -2581,7 +2576,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 181 + "pointer" : 180 }, { "return_type" : { @@ -2591,7 +2586,7 @@ { "params_type" : [ { - "type_ptr" : 176 + "type_ptr" : 175 } ] } @@ -2615,7 +2610,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 182 + "pointer" : 181 }, { "type_ptr" : 10 @@ -2626,12 +2621,12 @@ "pointer" : 26 }, { - "type_ptr" : 175 + "type_ptr" : 174 } )>, <"FunctionProtoType" : ( { - "pointer" : 183 + "pointer" : 182 }, { "return_type" : { @@ -2641,7 +2636,7 @@ { "params_type" : [ { - "type_ptr" : 182 + "type_ptr" : 181 } ] } @@ -2677,7 +2672,7 @@ )>, <"PointerType" : ( { - "pointer" : 184 + "pointer" : 183 }, { "type_ptr" : 13 @@ -2685,7 +2680,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 185 + "pointer" : 184 }, { "type_ptr" : 35 @@ -2693,7 +2688,7 @@ )>, <"PointerType" : ( { - "pointer" : 186 + "pointer" : 185 }, { "type_ptr" : 10 @@ -2701,7 +2696,7 @@ )>, <"PointerType" : ( { - "pointer" : 187 + "pointer" : 186 }, { "type_ptr" : 74 @@ -2709,7 +2704,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 188 + "pointer" : 187 }, { "type_ptr" : 10 @@ -2717,7 +2712,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 189 + "pointer" : 188 }, { "type_ptr" : 60 @@ -2725,28 +2720,28 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 190 + "pointer" : 189 }, { "return_type" : { - "type_ptr" : 185 + "type_ptr" : 184 } }, { "params_type" : [ { - "type_ptr" : 177 + "type_ptr" : 176 } ] } )>, <"FunctionProtoType" : ( { - "pointer" : 191 + "pointer" : 190 }, { "return_type" : { - "type_ptr" : 189 + "type_ptr" : 188 } }, { @@ -2759,17 +2754,17 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 192 + "pointer" : 191 }, { "return_type" : { - "type_ptr" : 185 + "type_ptr" : 184 } }, { "params_type" : [ { - "type_ptr" : 179 + "type_ptr" : 178 } ] } @@ -2780,7 +2775,7 @@ }, { "return_type" : { - "type_ptr" : 189 + "type_ptr" : 188 } }, { @@ -2797,7 +2792,7 @@ }, { "return_type" : { - "type_ptr" : 189 + "type_ptr" : 188 } }, { @@ -2810,10 +2805,10 @@ )>, <"PointerType" : ( { - "pointer" : 193 + "pointer" : 192 }, { - "type_ptr" : 190 + "type_ptr" : 189 } )>, <"PointerType" : ( @@ -2826,40 +2821,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 194 + "pointer" : 193 }, { - "base_type" : 141 + "base_type" : 142 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 195 + "pointer" : 194 }, { - "type_ptr" : 194 + "type_ptr" : 193 } )>, <"TypedefType" : ( { - "pointer" : 196, - "desugared_type" : 195 + "pointer" : 195, + "desugared_type" : 194 }, { "child_type" : { - "type_ptr" : 195 + "type_ptr" : 194 }, - "decl_ptr" : 197 + "decl_ptr" : 196 } )>, <"TypedefType" : ( { "pointer" : 85, - "desugared_type" : 195 + "desugared_type" : 194 }, { "child_type" : { - "type_ptr" : 196 + "type_ptr" : 195 }, "decl_ptr" : 84 } diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/comments.c.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/comments.c.exp index 21e6ca4ae5d..2f1c7edea92 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/comments.c.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/comments.c.exp @@ -498,47 +498,53 @@ { "pointer" : 62 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 63 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 64 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 65 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 66 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 67 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 68 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 69 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 69 + "pointer" : 70 }, { "type_ptr" : 12 @@ -546,31 +552,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 70 + "pointer" : 71 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 71 + "pointer" : 72 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 72 + "pointer" : 73 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 73 + "pointer" : 74 }, - 74 + 75 )>, <"PointerType" : ( { - "pointer" : 75 + "pointer" : 76 }, { "type_ptr" : 17, @@ -579,7 +585,7 @@ )>, <"PointerType" : ( { - "pointer" : 76 + "pointer" : 77 }, { "type_ptr" : 14, @@ -588,7 +594,7 @@ )>, <"PointerType" : ( { - "pointer" : 77 + "pointer" : 78 }, { "type_ptr" : 14 @@ -596,17 +602,17 @@ )>, <"RecordType" : ( { - "pointer" : 78 + "pointer" : 79 }, - 79 + 80 )>, <"ConstantArrayType" : ( { - "pointer" : 80 + "pointer" : 81 }, { "element_type" : { - "type_ptr" : 78 + "type_ptr" : 79 }, "stride" : 24 }, @@ -624,40 +630,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 81 + "pointer" : 82 }, { - "base_type" : 66 + "base_type" : 67 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 82 + "pointer" : 83 }, { - "type_ptr" : 81 + "type_ptr" : 82 } )>, <"TypedefType" : ( { - "pointer" : 83, - "desugared_type" : 82 + "pointer" : 84, + "desugared_type" : 83 }, { "child_type" : { - "type_ptr" : 82 + "type_ptr" : 83 }, - "decl_ptr" : 84 + "decl_ptr" : 85 } )>, <"TypedefType" : ( { "pointer" : 11, - "desugared_type" : 82 + "desugared_type" : 83 }, { "child_type" : { - "type_ptr" : 83 + "type_ptr" : 84 }, "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 e894670e9b6..bbab23043cb 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/const_cast.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/const_cast.cpp.exp @@ -1007,47 +1007,53 @@ { "pointer" : 84 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 85 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 86 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 87 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 88 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 89 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 90 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 91 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 91 + "pointer" : 92 }, { "type_ptr" : 29 @@ -1055,31 +1061,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 92 + "pointer" : 93 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 93 + "pointer" : 94 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 94 + "pointer" : 95 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 95 + "pointer" : 96 }, - 96 + 97 )>, <"PointerType" : ( { - "pointer" : 97 + "pointer" : 98 }, { "type_ptr" : 31, @@ -1088,7 +1094,7 @@ )>, <"PointerType" : ( { - "pointer" : 98 + "pointer" : 99 }, { "type_ptr" : 36, @@ -1097,7 +1103,7 @@ )>, <"PointerType" : ( { - "pointer" : 99 + "pointer" : 100 }, { "type_ptr" : 36 @@ -1105,17 +1111,17 @@ )>, <"RecordType" : ( { - "pointer" : 100 + "pointer" : 101 }, - 101 + 102 )>, <"ConstantArrayType" : ( { - "pointer" : 102 + "pointer" : 103 }, { "element_type" : { - "type_ptr" : 100 + "type_ptr" : 101 }, "stride" : 24 }, @@ -1129,7 +1135,7 @@ )>, <"PointerType" : ( { - "pointer" : 103 + "pointer" : 104 }, { "type_ptr" : 8 @@ -1155,7 +1161,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 104 + "pointer" : 105 }, { "type_ptr" : 8, @@ -1173,7 +1179,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 105 + "pointer" : 106 }, { "return_type" : { @@ -1183,7 +1189,7 @@ { "params_type" : [ { - "type_ptr" : 104 + "type_ptr" : 105 } ] } @@ -1207,7 +1213,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 106 + "pointer" : 107 }, { "type_ptr" : 8 @@ -1223,7 +1229,7 @@ )>, <"PointerType" : ( { - "pointer" : 107 + "pointer" : 108 }, { "type_ptr" : 8, @@ -1232,7 +1238,7 @@ )>, <"PointerType" : ( { - "pointer" : 108 + "pointer" : 109 }, { "type_ptr" : 22, @@ -1241,7 +1247,7 @@ )>, <"PointerType" : ( { - "pointer" : 109 + "pointer" : 110 }, { "type_ptr" : 22 @@ -1249,40 +1255,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 110 + "pointer" : 111 }, { - "base_type" : 88 + "base_type" : 89 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 111 + "pointer" : 112 }, { - "type_ptr" : 110 + "type_ptr" : 111 } )>, <"TypedefType" : ( { - "pointer" : 112, - "desugared_type" : 111 + "pointer" : 113, + "desugared_type" : 112 }, { "child_type" : { - "type_ptr" : 111 + "type_ptr" : 112 }, - "decl_ptr" : 113 + "decl_ptr" : 114 } )>, <"TypedefType" : ( { "pointer" : 34, - "desugared_type" : 111 + "desugared_type" : 112 }, { "child_type" : { - "type_ptr" : 112 + "type_ptr" : 113 }, "decl_ptr" : 33 } 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 acd64bbf06f..6fbbde38fd7 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/dynamic_cast.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/dynamic_cast.cpp.exp @@ -3370,47 +3370,53 @@ { "pointer" : 166 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 167 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 168 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 169 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 170 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 171 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 172 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 173 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 173 + "pointer" : 174 }, { "type_ptr" : 114 @@ -3418,31 +3424,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 174 + "pointer" : 175 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 175 + "pointer" : 176 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 176 + "pointer" : 177 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 177 + "pointer" : 178 }, - 178 + 179 )>, <"PointerType" : ( { - "pointer" : 179 + "pointer" : 180 }, { "type_ptr" : 119, @@ -3451,7 +3457,7 @@ )>, <"PointerType" : ( { - "pointer" : 180 + "pointer" : 181 }, { "type_ptr" : 116, @@ -3460,7 +3466,7 @@ )>, <"PointerType" : ( { - "pointer" : 181 + "pointer" : 182 }, { "type_ptr" : 116 @@ -3468,17 +3474,17 @@ )>, <"RecordType" : ( { - "pointer" : 182 + "pointer" : 183 }, - 183 + 184 )>, <"ConstantArrayType" : ( { - "pointer" : 184 + "pointer" : 185 }, { "element_type" : { - "type_ptr" : 182 + "type_ptr" : 183 }, "stride" : 24 }, @@ -3492,7 +3498,7 @@ )>, <"PointerType" : ( { - "pointer" : 185 + "pointer" : 186 }, { "type_ptr" : 8 @@ -3518,7 +3524,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 186 + "pointer" : 187 }, { "type_ptr" : 8 @@ -3534,7 +3540,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 187 + "pointer" : 188 }, { "type_ptr" : 8, @@ -3552,17 +3558,17 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 188 + "pointer" : 189 }, { "return_type" : { - "type_ptr" : 186 + "type_ptr" : 187 } }, { "params_type" : [ { - "type_ptr" : 187 + "type_ptr" : 188 } ] } @@ -3586,7 +3592,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 189 + "pointer" : 190 }, { "type_ptr" : 8 @@ -3602,17 +3608,17 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 190 + "pointer" : 191 }, { "return_type" : { - "type_ptr" : 186 + "type_ptr" : 187 } }, { "params_type" : [ { - "type_ptr" : 189 + "type_ptr" : 190 } ] } @@ -3660,7 +3666,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 191 + "pointer" : 192 }, { "type_ptr" : 33 @@ -3676,7 +3682,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 192 + "pointer" : 193 }, { "type_ptr" : 33, @@ -3694,17 +3700,17 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 193 + "pointer" : 194 }, { "return_type" : { - "type_ptr" : 191 + "type_ptr" : 192 } }, { "params_type" : [ { - "type_ptr" : 192 + "type_ptr" : 193 } ] } @@ -3728,7 +3734,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 194 + "pointer" : 195 }, { "type_ptr" : 33 @@ -3744,17 +3750,17 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 195 + "pointer" : 196 }, { "return_type" : { - "type_ptr" : 191 + "type_ptr" : 192 } }, { "params_type" : [ { - "type_ptr" : 194 + "type_ptr" : 195 } ] } @@ -3796,7 +3802,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 196 + "pointer" : 197 }, { "return_type" : { @@ -3808,7 +3814,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 197 + "pointer" : 198 }, { "return_type" : { @@ -3818,7 +3824,7 @@ { "params_type" : [ { - "type_ptr" : 187 + "type_ptr" : 188 } ] } @@ -3842,7 +3848,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 198 + "pointer" : 199 }, { "return_type" : { @@ -3852,7 +3858,7 @@ { "params_type" : [ { - "type_ptr" : 189 + "type_ptr" : 190 } ] } @@ -3896,7 +3902,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 199 + "pointer" : 200 }, { "return_type" : { @@ -3908,7 +3914,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 200 + "pointer" : 201 }, { "return_type" : { @@ -3918,7 +3924,7 @@ { "params_type" : [ { - "type_ptr" : 192 + "type_ptr" : 193 } ] } @@ -3942,7 +3948,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 201 + "pointer" : 202 }, { "return_type" : { @@ -3952,7 +3958,7 @@ { "params_type" : [ { - "type_ptr" : 194 + "type_ptr" : 195 } ] } @@ -3976,7 +3982,7 @@ )>, <"PointerType" : ( { - "pointer" : 202 + "pointer" : 203 }, { "type_ptr" : 33 @@ -3998,7 +4004,7 @@ )>, <"PointerType" : ( { - "pointer" : 203 + "pointer" : 204 }, { "type_ptr" : 56 @@ -4014,7 +4020,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 204 + "pointer" : 205 }, { "type_ptr" : 56 @@ -4030,40 +4036,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 205 + "pointer" : 206 }, { - "base_type" : 170 + "base_type" : 171 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 206 + "pointer" : 207 }, { - "type_ptr" : 205 + "type_ptr" : 206 } )>, <"TypedefType" : ( { - "pointer" : 207, - "desugared_type" : 206 + "pointer" : 208, + "desugared_type" : 207 }, { "child_type" : { - "type_ptr" : 206 + "type_ptr" : 207 }, - "decl_ptr" : 208 + "decl_ptr" : 209 } )>, <"TypedefType" : ( { "pointer" : 113, - "desugared_type" : 206 + "desugared_type" : 207 }, { "child_type" : { - "type_ptr" : 207 + "type_ptr" : 208 }, "decl_ptr" : 112 } 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 d63265775d3..f6d37887be3 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 @@ -3619,47 +3619,53 @@ { "pointer" : 166 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 167 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 168 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 169 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 170 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 171 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 172 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 173 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 173 + "pointer" : 174 }, { "type_ptr" : 115 @@ -3667,31 +3673,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 174 + "pointer" : 175 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 175 + "pointer" : 176 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 176 + "pointer" : 177 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 177 + "pointer" : 178 }, - 178 + 179 )>, <"PointerType" : ( { - "pointer" : 179 + "pointer" : 180 }, { "type_ptr" : 14, @@ -3700,7 +3706,7 @@ )>, <"PointerType" : ( { - "pointer" : 180 + "pointer" : 181 }, { "type_ptr" : 117, @@ -3709,7 +3715,7 @@ )>, <"PointerType" : ( { - "pointer" : 181 + "pointer" : 182 }, { "type_ptr" : 117 @@ -3717,17 +3723,17 @@ )>, <"RecordType" : ( { - "pointer" : 182 + "pointer" : 183 }, - 183 + 184 )>, <"ConstantArrayType" : ( { - "pointer" : 184 + "pointer" : 185 }, { "element_type" : { - "type_ptr" : 182 + "type_ptr" : 183 }, "stride" : 24 }, @@ -3741,7 +3747,7 @@ )>, <"PointerType" : ( { - "pointer" : 185 + "pointer" : 186 }, { "type_ptr" : 8 @@ -3772,7 +3778,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 186 + "pointer" : 187 }, { "type_ptr" : 8, @@ -3790,7 +3796,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 187 + "pointer" : 188 }, { "return_type" : { @@ -3800,7 +3806,7 @@ { "params_type" : [ { - "type_ptr" : 186 + "type_ptr" : 187 } ] } @@ -3824,7 +3830,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 188 + "pointer" : 189 }, { "type_ptr" : 8 @@ -3832,7 +3838,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 189 + "pointer" : 190 }, { "type_ptr" : 39 @@ -3840,17 +3846,17 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 190 + "pointer" : 191 }, { "return_type" : { - "type_ptr" : 188 + "type_ptr" : 189 } }, { "params_type" : [ { - "type_ptr" : 186 + "type_ptr" : 187 } ] } @@ -3861,7 +3867,7 @@ }, { "return_type" : { - "type_ptr" : 189 + "type_ptr" : 190 } }, { @@ -3886,7 +3892,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 191 + "pointer" : 192 }, { "return_type" : { @@ -3904,7 +3910,7 @@ )>, <"PointerType" : ( { - "pointer" : 192 + "pointer" : 193 }, { "type_ptr" : 25 @@ -3918,7 +3924,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 193 + "pointer" : 194 }, { "return_type" : { @@ -3930,7 +3936,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 194 + "pointer" : 195 }, { "return_type" : { @@ -3964,7 +3970,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 195 + "pointer" : 196 }, { "return_type" : { @@ -3998,7 +4004,7 @@ )>, <"PointerType" : ( { - "pointer" : 196 + "pointer" : 197 }, { "type_ptr" : 39 @@ -4018,10 +4024,10 @@ )>, <"PointerType" : ( { - "pointer" : 197 + "pointer" : 198 }, { - "type_ptr" : 194 + "type_ptr" : 195 } )>, <"PointerType" : ( @@ -4034,7 +4040,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 198 + "pointer" : 199 }, { "type_ptr" : 25, @@ -4052,7 +4058,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 199 + "pointer" : 200 }, { "return_type" : { @@ -4062,14 +4068,14 @@ { "params_type" : [ { - "type_ptr" : 198 + "type_ptr" : 199 } ] } )>, <"FunctionProtoType" : ( { - "pointer" : 200 + "pointer" : 201 }, { "return_type" : { @@ -4086,7 +4092,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 201 + "pointer" : 202 }, { "type_ptr" : 25 @@ -4094,7 +4100,7 @@ )>, <"PointerType" : ( { - "pointer" : 202 + "pointer" : 203 }, { "type_ptr" : 43 @@ -4102,10 +4108,10 @@ )>, <"PointerType" : ( { - "pointer" : 203 + "pointer" : 204 }, { - "type_ptr" : 195 + "type_ptr" : 196 } )>, <"PointerType" : ( @@ -4135,10 +4141,10 @@ )>, <"PointerType" : ( { - "pointer" : 204 + "pointer" : 205 }, { - "type_ptr" : 190 + "type_ptr" : 191 } )>, <"PointerType" : ( @@ -4151,40 +4157,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 205 + "pointer" : 206 }, { - "base_type" : 170 + "base_type" : 171 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 206 + "pointer" : 207 }, { - "type_ptr" : 205 + "type_ptr" : 206 } )>, <"TypedefType" : ( { - "pointer" : 207, - "desugared_type" : 206 + "pointer" : 208, + "desugared_type" : 207 }, { "child_type" : { - "type_ptr" : 206 + "type_ptr" : 207 }, - "decl_ptr" : 208 + "decl_ptr" : 209 } )>, <"TypedefType" : ( { "pointer" : 114, - "desugared_type" : 206 + "desugared_type" : 207 }, { "child_type" : { - "type_ptr" : 207 + "type_ptr" : 208 }, "decl_ptr" : 113 } diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/friend.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/friend.cpp.exp index 89dc9f45951..842f27a88bd 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/friend.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/friend.cpp.exp @@ -927,47 +927,53 @@ { "pointer" : 87 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 88 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 89 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 90 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 91 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 92 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 93 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 94 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 94 + "pointer" : 95 }, { "type_ptr" : 36 @@ -975,31 +981,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 95 + "pointer" : 96 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 96 + "pointer" : 97 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 97 + "pointer" : 98 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 98 + "pointer" : 99 }, - 99 + 100 )>, <"PointerType" : ( { - "pointer" : 100 + "pointer" : 101 }, { "type_ptr" : 30, @@ -1008,7 +1014,7 @@ )>, <"PointerType" : ( { - "pointer" : 101 + "pointer" : 102 }, { "type_ptr" : 38, @@ -1017,7 +1023,7 @@ )>, <"PointerType" : ( { - "pointer" : 102 + "pointer" : 103 }, { "type_ptr" : 38 @@ -1025,17 +1031,17 @@ )>, <"RecordType" : ( { - "pointer" : 103 + "pointer" : 104 }, - 104 + 105 )>, <"ConstantArrayType" : ( { - "pointer" : 105 + "pointer" : 106 }, { "element_type" : { - "type_ptr" : 103 + "type_ptr" : 104 }, "stride" : 24 }, @@ -1043,104 +1049,104 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 106 + "pointer" : 107 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 107 + "pointer" : 108 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 108 + "pointer" : 109 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 109 + "pointer" : 110 } )>, <"InjectedClassNameType" : ( { - "pointer" : 110 + "pointer" : 111 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 111 + "pointer" : 112 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 112 + "pointer" : 113 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 113 + "pointer" : 114 } )>, <"InjectedClassNameType" : ( { - "pointer" : 114 + "pointer" : 115 } )>, <"PointerType" : ( { - "pointer" : 115 + "pointer" : 116 }, { - "type_ptr" : 106 + "type_ptr" : 107 } )>, <"PointerType" : ( { - "pointer" : 116 + "pointer" : 117 }, { - "type_ptr" : 111 + "type_ptr" : 112 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 117 + "pointer" : 118 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 118 + "pointer" : 119 } )>, <"ElaboratedType" : ( { - "pointer" : 119, - "desugared_type" : 118 + "pointer" : 120, + "desugared_type" : 119 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 120 + "pointer" : 121 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 121 + "pointer" : 122 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 122 + "pointer" : 123 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 123 + "pointer" : 124 } )>, <"InjectedClassNameType" : ( { - "pointer" : 124 + "pointer" : 125 } )>, <"RecordType" : ( @@ -1151,7 +1157,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 125, + "pointer" : 126, "desugared_type" : 13 } )>, @@ -1163,7 +1169,7 @@ )>, <"SubstTemplateTypeParmType" : ( { - "pointer" : 126, + "pointer" : 127, "desugared_type" : 30 } )>, @@ -1177,10 +1183,10 @@ )>, <"PointerType" : ( { - "pointer" : 127 + "pointer" : 128 }, { - "type_ptr" : 126 + "type_ptr" : 127 } )>, <"RecordType" : ( @@ -1191,7 +1197,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 128, + "pointer" : 129, "desugared_type" : 9 } )>, @@ -1203,12 +1209,12 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 129 + "pointer" : 130 } )>, <"FunctionProtoType" : ( { - "pointer" : 130 + "pointer" : 131 }, { "return_type" : { @@ -1220,7 +1226,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 131 + "pointer" : 132 }, { "return_type" : { @@ -1232,13 +1238,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 132, + "pointer" : 133, "desugared_type" : 13 } )>, <"LValueReferenceType" : ( { - "pointer" : 133 + "pointer" : 134 }, { "type_ptr" : 13, @@ -1250,13 +1256,13 @@ "pointer" : 25 }, { - "type_ptr" : 132, + "type_ptr" : 133, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 134 + "pointer" : 135 }, { "return_type" : { @@ -1266,7 +1272,7 @@ { "params_type" : [ { - "type_ptr" : 133 + "type_ptr" : 134 } ] } @@ -1290,7 +1296,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 135 + "pointer" : 136 }, { "type_ptr" : 13 @@ -1301,12 +1307,12 @@ "pointer" : 29 }, { - "type_ptr" : 132 + "type_ptr" : 133 } )>, <"FunctionProtoType" : ( { - "pointer" : 136 + "pointer" : 137 }, { "return_type" : { @@ -1316,7 +1322,7 @@ { "params_type" : [ { - "type_ptr" : 135 + "type_ptr" : 136 } ] } @@ -1352,7 +1358,7 @@ )>, <"PointerType" : ( { - "pointer" : 137 + "pointer" : 138 }, { "type_ptr" : 13 @@ -1360,7 +1366,7 @@ )>, <"PointerType" : ( { - "pointer" : 138 + "pointer" : 139 }, { "type_ptr" : 32 @@ -1368,7 +1374,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 139 + "pointer" : 140 }, { "type_ptr" : 13 @@ -1376,40 +1382,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 140 + "pointer" : 141 }, { - "base_type" : 91 + "base_type" : 92 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 141 + "pointer" : 142 }, { - "type_ptr" : 140 + "type_ptr" : 141 } )>, <"TypedefType" : ( { - "pointer" : 142, - "desugared_type" : 141 + "pointer" : 143, + "desugared_type" : 142 }, { "child_type" : { - "type_ptr" : 141 + "type_ptr" : 142 }, - "decl_ptr" : 143 + "decl_ptr" : 144 } )>, <"TypedefType" : ( { "pointer" : 35, - "desugared_type" : 141 + "desugared_type" : 142 }, { "child_type" : { - "type_ptr" : 142 + "type_ptr" : 143 }, "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 3e2f1191ac6..dc94deab96a 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/function_template.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/function_template.cpp.exp @@ -1717,47 +1717,53 @@ { "pointer" : 118 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 119 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 120 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 121 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 122 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 123 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 124 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 125 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 125 + "pointer" : 126 }, { "type_ptr" : 70 @@ -1765,31 +1771,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 126 + "pointer" : 127 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 127 + "pointer" : 128 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 128 + "pointer" : 129 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 129 + "pointer" : 130 }, - 130 + 131 )>, <"PointerType" : ( { - "pointer" : 131 + "pointer" : 132 }, { "type_ptr" : 38, @@ -1798,7 +1804,7 @@ )>, <"PointerType" : ( { - "pointer" : 132 + "pointer" : 133 }, { "type_ptr" : 25, @@ -1807,7 +1813,7 @@ )>, <"PointerType" : ( { - "pointer" : 133 + "pointer" : 134 }, { "type_ptr" : 25 @@ -1815,17 +1821,17 @@ )>, <"RecordType" : ( { - "pointer" : 134 + "pointer" : 135 }, - 135 + 136 )>, <"ConstantArrayType" : ( { - "pointer" : 136 + "pointer" : 137 }, { "element_type" : { - "type_ptr" : 134 + "type_ptr" : 135 }, "stride" : 24 }, @@ -1833,44 +1839,44 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 137 + "pointer" : 138 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 138 + "pointer" : 139 } )>, <"FunctionProtoType" : ( { - "pointer" : 139 + "pointer" : 140 }, { "return_type" : { - "type_ptr" : 137 + "type_ptr" : 138 } }, { "params_type" : [ { - "type_ptr" : 137 + "type_ptr" : 138 } ] } )>, <"FunctionProtoType" : ( { - "pointer" : 140 + "pointer" : 141 }, { "return_type" : { - "type_ptr" : 138 + "type_ptr" : 139 } }, { "params_type" : [ { - "type_ptr" : 138 + "type_ptr" : 139 } ] } @@ -1894,30 +1900,30 @@ )>, <"SubstTemplateTypeParmType" : ( { - "pointer" : 141, + "pointer" : 142, "desugared_type" : 38 } )>, <"FunctionProtoType" : ( { - "pointer" : 142 + "pointer" : 143 }, { "return_type" : { - "type_ptr" : 141 + "type_ptr" : 142 } }, { "params_type" : [ { - "type_ptr" : 141 + "type_ptr" : 142 } ] } )>, <"FunctionProtoType" : ( { - "pointer" : 143 + "pointer" : 144 }, { "return_type" : { @@ -1975,7 +1981,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 144 + "pointer" : 145 }, { "return_type" : { @@ -2009,10 +2015,10 @@ )>, <"PointerType" : ( { - "pointer" : 145 + "pointer" : 146 }, { - "type_ptr" : 144 + "type_ptr" : 145 } )>, <"PointerType" : ( @@ -2031,7 +2037,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 146 + "pointer" : 147 }, { "return_type" : { @@ -2065,10 +2071,10 @@ )>, <"PointerType" : ( { - "pointer" : 147 + "pointer" : 148 }, { - "type_ptr" : 146 + "type_ptr" : 147 } )>, <"PointerType" : ( @@ -2081,40 +2087,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 148 + "pointer" : 149 }, { - "base_type" : 122 + "base_type" : 123 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 149 + "pointer" : 150 }, { - "type_ptr" : 148 + "type_ptr" : 149 } )>, <"TypedefType" : ( { - "pointer" : 150, - "desugared_type" : 149 + "pointer" : 151, + "desugared_type" : 150 }, { "child_type" : { - "type_ptr" : 149 + "type_ptr" : 150 }, - "decl_ptr" : 151 + "decl_ptr" : 152 } )>, <"TypedefType" : ( { "pointer" : 69, - "desugared_type" : 149 + "desugared_type" : 150 }, { "child_type" : { - "type_ptr" : 150 + "type_ptr" : 151 }, "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 e4bd08e7df2..53d4ce3259d 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 @@ -1778,47 +1778,53 @@ { "pointer" : 93 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 94 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 95 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 96 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 97 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 98 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 99 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 100 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 100 + "pointer" : 101 }, { "type_ptr" : 45 @@ -1826,31 +1832,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 101 + "pointer" : 102 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 102 + "pointer" : 103 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 103 + "pointer" : 104 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 104 + "pointer" : 105 }, - 105 + 106 )>, <"PointerType" : ( { - "pointer" : 106 + "pointer" : 107 }, { "type_ptr" : 15, @@ -1859,7 +1865,7 @@ )>, <"PointerType" : ( { - "pointer" : 107 + "pointer" : 108 }, { "type_ptr" : 12, @@ -1868,7 +1874,7 @@ )>, <"PointerType" : ( { - "pointer" : 108 + "pointer" : 109 }, { "type_ptr" : 12 @@ -1876,17 +1882,17 @@ )>, <"RecordType" : ( { - "pointer" : 109 + "pointer" : 110 }, - 110 + 111 )>, <"ConstantArrayType" : ( { - "pointer" : 111 + "pointer" : 112 }, { "element_type" : { - "type_ptr" : 109 + "type_ptr" : 110 }, "stride" : 24 }, @@ -1906,40 +1912,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 112 + "pointer" : 113 }, { - "base_type" : 97 + "base_type" : 98 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 113 + "pointer" : 114 }, { - "type_ptr" : 112 + "type_ptr" : 113 } )>, <"TypedefType" : ( { - "pointer" : 114, - "desugared_type" : 113 + "pointer" : 115, + "desugared_type" : 114 }, { "child_type" : { - "type_ptr" : 113 + "type_ptr" : 114 }, - "decl_ptr" : 115 + "decl_ptr" : 116 } )>, <"TypedefType" : ( { "pointer" : 44, - "desugared_type" : 113 + "desugared_type" : 114 }, { "child_type" : { - "type_ptr" : 114 + "type_ptr" : 115 }, "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 6de50940ddc..460ba3ede6b 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheritance.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheritance.cpp.exp @@ -2919,47 +2919,53 @@ { "pointer" : 176 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 177 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 178 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 179 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 180 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 181 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 182 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 183 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 183 + "pointer" : 184 }, { "type_ptr" : 103 @@ -2967,31 +2973,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 184 + "pointer" : 185 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 185 + "pointer" : 186 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 186 + "pointer" : 187 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 187 + "pointer" : 188 }, - 188 + 189 )>, <"PointerType" : ( { - "pointer" : 189 + "pointer" : 190 }, { "type_ptr" : 22, @@ -3000,7 +3006,7 @@ )>, <"PointerType" : ( { - "pointer" : 190 + "pointer" : 191 }, { "type_ptr" : 129, @@ -3009,7 +3015,7 @@ )>, <"PointerType" : ( { - "pointer" : 191 + "pointer" : 192 }, { "type_ptr" : 129 @@ -3017,17 +3023,17 @@ )>, <"RecordType" : ( { - "pointer" : 192 + "pointer" : 193 }, - 193 + 194 )>, <"ConstantArrayType" : ( { - "pointer" : 194 + "pointer" : 195 }, { "element_type" : { - "type_ptr" : 192 + "type_ptr" : 193 }, "stride" : 24 }, @@ -3133,7 +3139,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 195 + "pointer" : 196 }, { "type_ptr" : 16 @@ -3141,7 +3147,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 196 + "pointer" : 197 }, { "type_ptr" : 126 @@ -3149,7 +3155,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 197 + "pointer" : 198 }, { "type_ptr" : 16, @@ -3167,17 +3173,17 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 198 + "pointer" : 199 }, { "return_type" : { - "type_ptr" : 195 + "type_ptr" : 196 } }, { "params_type" : [ { - "type_ptr" : 197 + "type_ptr" : 198 } ] } @@ -3188,7 +3194,7 @@ }, { "return_type" : { - "type_ptr" : 196 + "type_ptr" : 197 } }, { @@ -3201,7 +3207,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 199 + "pointer" : 200 }, { "type_ptr" : 16 @@ -3217,17 +3223,17 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 200 + "pointer" : 201 }, { "return_type" : { - "type_ptr" : 195 + "type_ptr" : 196 } }, { "params_type" : [ { - "type_ptr" : 199 + "type_ptr" : 200 } ] } @@ -3238,7 +3244,7 @@ }, { "return_type" : { - "type_ptr" : 196 + "type_ptr" : 197 } }, { @@ -3277,7 +3283,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 201 + "pointer" : 202 }, { "type_ptr" : 54 @@ -3297,21 +3303,21 @@ )>, <"ElaboratedType" : ( { - "pointer" : 202, + "pointer" : 203, "desugared_type" : 54 } )>, <"LValueReferenceType" : ( { - "pointer" : 203 + "pointer" : 204 }, { - "type_ptr" : 202 + "type_ptr" : 203 } )>, <"LValueReferenceType" : ( { - "pointer" : 204 + "pointer" : 205 }, { "type_ptr" : 54, @@ -3323,23 +3329,23 @@ "pointer" : 119 }, { - "type_ptr" : 202, + "type_ptr" : 203, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 205 + "pointer" : 206 }, { "return_type" : { - "type_ptr" : 201 + "type_ptr" : 202 } }, { "params_type" : [ { - "type_ptr" : 204 + "type_ptr" : 205 } ] } @@ -3350,7 +3356,7 @@ }, { "return_type" : { - "type_ptr" : 203 + "type_ptr" : 204 } }, { @@ -3363,7 +3369,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 206 + "pointer" : 207 }, { "type_ptr" : 54 @@ -3374,22 +3380,22 @@ "pointer" : 123 }, { - "type_ptr" : 202 + "type_ptr" : 203 } )>, <"FunctionProtoType" : ( { - "pointer" : 207 + "pointer" : 208 }, { "return_type" : { - "type_ptr" : 201 + "type_ptr" : 202 } }, { "params_type" : [ { - "type_ptr" : 206 + "type_ptr" : 207 } ] } @@ -3400,7 +3406,7 @@ }, { "return_type" : { - "type_ptr" : 203 + "type_ptr" : 204 } }, { @@ -3441,40 +3447,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 208 + "pointer" : 209 }, { - "base_type" : 180 + "base_type" : 181 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 209 + "pointer" : 210 }, { - "type_ptr" : 208 + "type_ptr" : 209 } )>, <"TypedefType" : ( { - "pointer" : 210, - "desugared_type" : 209 + "pointer" : 211, + "desugared_type" : 210 }, { "child_type" : { - "type_ptr" : 209 + "type_ptr" : 210 }, - "decl_ptr" : 211 + "decl_ptr" : 212 } )>, <"TypedefType" : ( { "pointer" : 128, - "desugared_type" : 209 + "desugared_type" : 210 }, { "child_type" : { - "type_ptr" : 210 + "type_ptr" : 211 }, "decl_ptr" : 127 } 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 aa02340f730..f8add78e7e2 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheriting_constructor.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/inheriting_constructor.cpp.exp @@ -1463,47 +1463,53 @@ { "pointer" : 112 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 113 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 114 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 115 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 116 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 117 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 118 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 119 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 119 + "pointer" : 120 }, { "type_ptr" : 61 @@ -1511,31 +1517,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 120 + "pointer" : 121 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 121 + "pointer" : 122 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 122 + "pointer" : 123 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 123 + "pointer" : 124 }, - 124 + 125 )>, <"PointerType" : ( { - "pointer" : 125 + "pointer" : 126 }, { "type_ptr" : 13, @@ -1544,7 +1550,7 @@ )>, <"PointerType" : ( { - "pointer" : 126 + "pointer" : 127 }, { "type_ptr" : 63, @@ -1553,7 +1559,7 @@ )>, <"PointerType" : ( { - "pointer" : 127 + "pointer" : 128 }, { "type_ptr" : 63 @@ -1561,17 +1567,17 @@ )>, <"RecordType" : ( { - "pointer" : 128 + "pointer" : 129 }, - 129 + 130 )>, <"ConstantArrayType" : ( { - "pointer" : 130 + "pointer" : 131 }, { "element_type" : { - "type_ptr" : 128 + "type_ptr" : 129 }, "stride" : 24 }, @@ -1585,7 +1591,7 @@ )>, <"PointerType" : ( { - "pointer" : 131 + "pointer" : 132 }, { "type_ptr" : 8 @@ -1634,7 +1640,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 132 + "pointer" : 133 }, { "type_ptr" : 8, @@ -1652,7 +1658,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 133 + "pointer" : 134 }, { "return_type" : { @@ -1662,7 +1668,7 @@ { "params_type" : [ { - "type_ptr" : 132 + "type_ptr" : 133 } ] } @@ -1686,7 +1692,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 134 + "pointer" : 135 }, { "type_ptr" : 8 @@ -1702,7 +1708,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 135 + "pointer" : 136 }, { "return_type" : { @@ -1712,7 +1718,7 @@ { "params_type" : [ { - "type_ptr" : 134 + "type_ptr" : 135 } ] } @@ -1754,7 +1760,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 136 + "pointer" : 137 }, { "type_ptr" : 29, @@ -1772,7 +1778,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 137 + "pointer" : 138 }, { "return_type" : { @@ -1782,7 +1788,7 @@ { "params_type" : [ { - "type_ptr" : 136 + "type_ptr" : 137 } ] } @@ -1818,7 +1824,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 138 + "pointer" : 139 }, { "type_ptr" : 29 @@ -1834,7 +1840,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 139 + "pointer" : 140 }, { "return_type" : { @@ -1844,7 +1850,7 @@ { "params_type" : [ { - "type_ptr" : 138 + "type_ptr" : 139 } ] } @@ -1880,15 +1886,15 @@ )>, <"PointerType" : ( { - "pointer" : 140 + "pointer" : 141 }, { - "type_ptr" : 127 + "type_ptr" : 128 } )>, <"LValueReferenceType" : ( { - "pointer" : 141 + "pointer" : 142 }, { "type_ptr" : 8 @@ -1896,7 +1902,7 @@ )>, <"PointerType" : ( { - "pointer" : 142 + "pointer" : 143 }, { "type_ptr" : 29 @@ -1904,7 +1910,7 @@ )>, <"PointerType" : ( { - "pointer" : 143 + "pointer" : 144 }, { "type_ptr" : 57 @@ -1912,7 +1918,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 144 + "pointer" : 145 }, { "return_type" : { @@ -1946,40 +1952,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 145 + "pointer" : 146 }, { - "base_type" : 116 + "base_type" : 117 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 146 + "pointer" : 147 }, { - "type_ptr" : 145 + "type_ptr" : 146 } )>, <"TypedefType" : ( { - "pointer" : 147, - "desugared_type" : 146 + "pointer" : 148, + "desugared_type" : 147 }, { "child_type" : { - "type_ptr" : 146 + "type_ptr" : 147 }, - "decl_ptr" : 148 + "decl_ptr" : 149 } )>, <"TypedefType" : ( { "pointer" : 60, - "desugared_type" : 146 + "desugared_type" : 147 }, { "child_type" : { - "type_ptr" : 147 + "type_ptr" : 148 }, "decl_ptr" : 59 } diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/lambda.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/lambda.cpp.exp index 415684e614a..b618b8fbb00 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/lambda.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/lambda.cpp.exp @@ -5662,47 +5662,53 @@ { "pointer" : 172 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 173 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 174 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 175 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 176 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 177 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 178 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 179 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 179 + "pointer" : 180 }, { "type_ptr" : 121 @@ -5710,31 +5716,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 180 + "pointer" : 181 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 181 + "pointer" : 182 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 182 + "pointer" : 183 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 183 + "pointer" : 184 }, - 184 + 185 )>, <"PointerType" : ( { - "pointer" : 185 + "pointer" : 186 }, { "type_ptr" : 12, @@ -5743,7 +5749,7 @@ )>, <"PointerType" : ( { - "pointer" : 186 + "pointer" : 187 }, { "type_ptr" : 123, @@ -5752,7 +5758,7 @@ )>, <"PointerType" : ( { - "pointer" : 187 + "pointer" : 188 }, { "type_ptr" : 123 @@ -5760,17 +5766,17 @@ )>, <"RecordType" : ( { - "pointer" : 188 + "pointer" : 189 }, - 189 + 190 )>, <"ConstantArrayType" : ( { - "pointer" : 190 + "pointer" : 191 }, { "element_type" : { - "type_ptr" : 188 + "type_ptr" : 189 }, "stride" : 24 }, @@ -5790,10 +5796,10 @@ )>, <"PointerType" : ( { - "pointer" : 191 + "pointer" : 192 }, { - "type_ptr" : 187 + "type_ptr" : 188 } )>, <"RecordType" : ( @@ -5804,11 +5810,11 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 192 + "pointer" : 193 }, { "return_type" : { - "type_ptr" : 193 + "type_ptr" : 194 } }, { @@ -5816,18 +5822,18 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 194 + "pointer" : 195 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 195 + "pointer" : 196 } )>, <"AutoType" : ( { - "pointer" : 196, - "desugared_type" : 195 + "pointer" : 197, + "desugared_type" : 196 } )>, <"AutoType" : ( @@ -5838,7 +5844,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 197 + "pointer" : 198 }, { "return_type" : { @@ -5874,7 +5880,7 @@ )>, <"PointerType" : ( { - "pointer" : 198 + "pointer" : 199 }, { "type_ptr" : 8 @@ -5882,7 +5888,7 @@ )>, <"PointerType" : ( { - "pointer" : 199 + "pointer" : 200 }, { "type_ptr" : 29 @@ -5890,11 +5896,11 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 200 + "pointer" : 201 }, { "return_type" : { - "type_ptr" : 198 + "type_ptr" : 199 } }, { @@ -5906,7 +5912,7 @@ }, { "return_type" : { - "type_ptr" : 199 + "type_ptr" : 200 } }, { @@ -5914,7 +5920,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 201 + "pointer" : 202 }, { "return_type" : { @@ -5926,7 +5932,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 202 + "pointer" : 203 }, { "return_type" : { @@ -5950,13 +5956,13 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 203 + "pointer" : 204 } )>, <"AutoType" : ( { - "pointer" : 204, - "desugared_type" : 203 + "pointer" : 205, + "desugared_type" : 204 } )>, <"AutoType" : ( @@ -5967,13 +5973,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 205, + "pointer" : 206, "desugared_type" : 22 } )>, <"LValueReferenceType" : ( { - "pointer" : 206 + "pointer" : 207 }, { "type_ptr" : 22, @@ -5985,13 +5991,13 @@ "pointer" : 35 }, { - "type_ptr" : 205, + "type_ptr" : 206, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 207 + "pointer" : 208 }, { "return_type" : { @@ -6001,7 +6007,7 @@ { "params_type" : [ { - "type_ptr" : 206 + "type_ptr" : 207 } ] } @@ -6025,7 +6031,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 208 + "pointer" : 209 }, { "type_ptr" : 22 @@ -6036,12 +6042,12 @@ "pointer" : 39 }, { - "type_ptr" : 205 + "type_ptr" : 206 } )>, <"FunctionProtoType" : ( { - "pointer" : 209 + "pointer" : 210 }, { "return_type" : { @@ -6051,14 +6057,14 @@ { "params_type" : [ { - "type_ptr" : 208 + "type_ptr" : 209 } ] } )>, <"FunctionProtoType" : ( { - "pointer" : 210 + "pointer" : 211 }, { "return_type" : { @@ -6075,7 +6081,7 @@ )>, <"PointerType" : ( { - "pointer" : 211 + "pointer" : 212 }, { "type_ptr" : 22 @@ -6083,7 +6089,7 @@ )>, <"PointerType" : ( { - "pointer" : 212 + "pointer" : 213 }, { "type_ptr" : 41 @@ -6091,7 +6097,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 213 + "pointer" : 214 }, { "type_ptr" : 22 @@ -6130,11 +6136,11 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 214 + "pointer" : 215 }, { "return_type" : { - "type_ptr" : 193 + "type_ptr" : 194 } }, { @@ -6147,18 +6153,18 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 215 + "pointer" : 216 } )>, <"AutoType" : ( { - "pointer" : 216, - "desugared_type" : 215 + "pointer" : 217, + "desugared_type" : 216 } )>, <"FunctionProtoType" : ( { - "pointer" : 217 + "pointer" : 218 }, { "return_type" : { @@ -6192,7 +6198,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 218 + "pointer" : 219 }, { "return_type" : { @@ -6204,13 +6210,13 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 219 + "pointer" : 220 } )>, <"AutoType" : ( { - "pointer" : 220, - "desugared_type" : 219 + "pointer" : 221, + "desugared_type" : 220 } )>, <"AutoType" : ( @@ -6227,7 +6233,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 221 + "pointer" : 222 }, { "type_ptr" : 55, @@ -6245,7 +6251,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 222 + "pointer" : 223 }, { "return_type" : { @@ -6255,7 +6261,7 @@ { "params_type" : [ { - "type_ptr" : 221 + "type_ptr" : 222 } ] } @@ -6279,7 +6285,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 223 + "pointer" : 224 }, { "type_ptr" : 55 @@ -6295,7 +6301,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 224 + "pointer" : 225 }, { "return_type" : { @@ -6305,14 +6311,14 @@ { "params_type" : [ { - "type_ptr" : 223 + "type_ptr" : 224 } ] } )>, <"FunctionProtoType" : ( { - "pointer" : 225 + "pointer" : 226 }, { "return_type" : { @@ -6329,7 +6335,7 @@ )>, <"PointerType" : ( { - "pointer" : 226 + "pointer" : 227 }, { "type_ptr" : 55 @@ -6337,7 +6343,7 @@ )>, <"PointerType" : ( { - "pointer" : 227 + "pointer" : 228 }, { "type_ptr" : 81 @@ -6345,7 +6351,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 228 + "pointer" : 229 }, { "type_ptr" : 55 @@ -6370,13 +6376,13 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 229 + "pointer" : 230 } )>, <"AutoType" : ( { - "pointer" : 230, - "desugared_type" : 229 + "pointer" : 231, + "desugared_type" : 230 } )>, <"RecordType" : ( @@ -6387,18 +6393,18 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 231 + "pointer" : 232 } )>, <"AutoType" : ( { - "pointer" : 232, - "desugared_type" : 231 + "pointer" : 233, + "desugared_type" : 232 } )>, <"AutoType" : ( { - "pointer" : 233, + "pointer" : 234, "desugared_type" : 12 } )>, @@ -6408,7 +6414,7 @@ }, { "return_type" : { - "type_ptr" : 233 + "type_ptr" : 234 } }, { @@ -6416,7 +6422,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 234 + "pointer" : 235 }, { "return_type" : { @@ -6428,13 +6434,13 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 235 + "pointer" : 236 } )>, <"AutoType" : ( { - "pointer" : 236, - "desugared_type" : 235 + "pointer" : 237, + "desugared_type" : 236 } )>, <"AutoType" : ( @@ -6451,7 +6457,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 237 + "pointer" : 238 }, { "type_ptr" : 95, @@ -6469,7 +6475,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 238 + "pointer" : 239 }, { "return_type" : { @@ -6479,7 +6485,7 @@ { "params_type" : [ { - "type_ptr" : 237 + "type_ptr" : 238 } ] } @@ -6503,7 +6509,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 239 + "pointer" : 240 }, { "type_ptr" : 95 @@ -6519,7 +6525,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 240 + "pointer" : 241 }, { "return_type" : { @@ -6529,14 +6535,14 @@ { "params_type" : [ { - "type_ptr" : 239 + "type_ptr" : 240 } ] } )>, <"FunctionProtoType" : ( { - "pointer" : 241 + "pointer" : 242 }, { "return_type" : { @@ -6553,7 +6559,7 @@ )>, <"PointerType" : ( { - "pointer" : 242 + "pointer" : 243 }, { "type_ptr" : 95 @@ -6561,7 +6567,7 @@ )>, <"PointerType" : ( { - "pointer" : 243 + "pointer" : 244 }, { "type_ptr" : 115 @@ -6569,7 +6575,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 244 + "pointer" : 245 }, { "type_ptr" : 95 @@ -6594,40 +6600,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 245 + "pointer" : 246 }, { - "base_type" : 176 + "base_type" : 177 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 246 + "pointer" : 247 }, { - "type_ptr" : 245 + "type_ptr" : 246 } )>, <"TypedefType" : ( { - "pointer" : 247, - "desugared_type" : 246 + "pointer" : 248, + "desugared_type" : 247 }, { "child_type" : { - "type_ptr" : 246 + "type_ptr" : 247 }, - "decl_ptr" : 248 + "decl_ptr" : 249 } )>, <"TypedefType" : ( { "pointer" : 120, - "desugared_type" : 246 + "desugared_type" : 247 }, { "child_type" : { - "type_ptr" : 247 + "type_ptr" : 248 }, "decl_ptr" : 119 } 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 c4505c63e88..7739906bf1c 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/materialize_temporary.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/materialize_temporary.cpp.exp @@ -594,47 +594,53 @@ { "pointer" : 67 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 68 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 69 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 70 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 71 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 72 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 73 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 74 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 74 + "pointer" : 75 }, { "type_ptr" : 17 @@ -642,31 +648,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 75 + "pointer" : 76 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 76 + "pointer" : 77 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 77 + "pointer" : 78 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 78 + "pointer" : 79 }, - 79 + 80 )>, <"PointerType" : ( { - "pointer" : 80 + "pointer" : 81 }, { "type_ptr" : 14, @@ -675,7 +681,7 @@ )>, <"PointerType" : ( { - "pointer" : 81 + "pointer" : 82 }, { "type_ptr" : 19, @@ -684,7 +690,7 @@ )>, <"PointerType" : ( { - "pointer" : 82 + "pointer" : 83 }, { "type_ptr" : 19 @@ -692,17 +698,17 @@ )>, <"RecordType" : ( { - "pointer" : 83 + "pointer" : 84 }, - 84 + 85 )>, <"ConstantArrayType" : ( { - "pointer" : 85 + "pointer" : 86 }, { "element_type" : { - "type_ptr" : 83 + "type_ptr" : 84 }, "stride" : 24 }, @@ -719,40 +725,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 86 + "pointer" : 87 }, { - "base_type" : 71 + "base_type" : 72 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 87 + "pointer" : 88 }, { - "type_ptr" : 86 + "type_ptr" : 87 } )>, <"TypedefType" : ( { - "pointer" : 88, - "desugared_type" : 87 + "pointer" : 89, + "desugared_type" : 88 }, { "child_type" : { - "type_ptr" : 87 + "type_ptr" : 88 }, - "decl_ptr" : 89 + "decl_ptr" : 90 } )>, <"TypedefType" : ( { "pointer" : 16, - "desugared_type" : 87 + "desugared_type" : 88 }, { "child_type" : { - "type_ptr" : 88 + "type_ptr" : 89 }, "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 cf7a5474390..ad6dd2bc7d6 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/namespace_decl.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/namespace_decl.cpp.exp @@ -190,17 +190,6 @@ { }, { - "original_namespace" : { - "kind" : <"Namespace">, - "decl_pointer" : 8, - "name" : { - "name" : "V", - "qual_name" : [ - "V", - "Q" - ] - } - } } )>, <"NamespaceDecl" : ( @@ -681,47 +670,53 @@ { "pointer" : 68 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 69 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 70 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 71 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 72 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 73 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 74 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 75 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 75 + "pointer" : 76 }, { "type_ptr" : 17 @@ -729,31 +724,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 76 + "pointer" : 77 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 77 + "pointer" : 78 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 78 + "pointer" : 79 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 79 + "pointer" : 80 }, - 80 + 81 )>, <"PointerType" : ( { - "pointer" : 81 + "pointer" : 82 }, { "type_ptr" : 12, @@ -762,7 +757,7 @@ )>, <"PointerType" : ( { - "pointer" : 82 + "pointer" : 83 }, { "type_ptr" : 19, @@ -771,7 +766,7 @@ )>, <"PointerType" : ( { - "pointer" : 83 + "pointer" : 84 }, { "type_ptr" : 19 @@ -779,17 +774,17 @@ )>, <"RecordType" : ( { - "pointer" : 84 + "pointer" : 85 }, - 85 + 86 )>, <"ConstantArrayType" : ( { - "pointer" : 86 + "pointer" : 87 }, { "element_type" : { - "type_ptr" : 84 + "type_ptr" : 85 }, "stride" : 24 }, @@ -797,40 +792,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 87 + "pointer" : 88 }, { - "base_type" : 72 + "base_type" : 73 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 88 + "pointer" : 89 }, { - "type_ptr" : 87 + "type_ptr" : 88 } )>, <"TypedefType" : ( { - "pointer" : 89, - "desugared_type" : 88 + "pointer" : 90, + "desugared_type" : 89 }, { "child_type" : { - "type_ptr" : 88 + "type_ptr" : 89 }, - "decl_ptr" : 90 + "decl_ptr" : 91 } )>, <"TypedefType" : ( { "pointer" : 16, - "desugared_type" : 88 + "desugared_type" : 89 }, { "child_type" : { - "type_ptr" : 89 + "type_ptr" : 90 }, "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 6466a5394bc..fb151c7d2df 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/new.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/new.cpp.exp @@ -3293,8 +3293,6 @@ } ), "is_implicit" : true, - "is_used" : true, - "is_this_declaration_referenced" : true, "attributes" : [ <"VisibilityAttr" : ( { @@ -3378,6 +3376,99 @@ )> ] }, + { + "name" : "operator delete", + "qual_name" : [ + "operator delete" + ] + }, + { + "type_ptr" : 139 + }, + { + "mangled_name" : "4859567291822092785", + "is_cpp" : true, + "parameters" : [ + <"ParmVarDecl" : ( + { + "pointer" : 140, + "parent_pointer" : 137, + "source_range" : ( + { + }, + { + } + ), + "is_implicit" : true + }, + { + "name" : "", + "qual_name" : [ + "" + ] + }, + { + "type_ptr" : 136 + }, + { + "parm_index_in_function" : 0 + } + )>, + <"ParmVarDecl" : ( + { + "pointer" : 141, + "parent_pointer" : 137, + "source_range" : ( + { + }, + { + } + ), + "is_implicit" : true + }, + { + "name" : "", + "qual_name" : [ + "" + ] + }, + { + "type_ptr" : 68 + }, + { + "parm_index_in_function" : 0 + } + )> + ] + } + )>, + <"FunctionDecl" : ( + { + "pointer" : 142, + "source_range" : ( + { + }, + { + } + ), + "is_implicit" : true, + "is_used" : true, + "is_this_declaration_referenced" : true, + "attributes" : [ + <"VisibilityAttr" : ( + { + "pointer" : 143, + "source_range" : ( + { + }, + { + } + ) + }, + <"DefaultVisibility"> + )> + ] + }, { "name" : "operator delete[]", "qual_name" : [ @@ -3393,8 +3484,8 @@ "parameters" : [ <"ParmVarDecl" : ( { - "pointer" : 139, - "parent_pointer" : 137, + "pointer" : 144, + "parent_pointer" : 142, "source_range" : ( { }, @@ -3421,7 +3512,100 @@ )>, <"FunctionDecl" : ( { - "pointer" : 140, + "pointer" : 145, + "source_range" : ( + { + }, + { + } + ), + "is_implicit" : true, + "is_used" : true, + "is_this_declaration_referenced" : true, + "attributes" : [ + <"VisibilityAttr" : ( + { + "pointer" : 146, + "source_range" : ( + { + }, + { + } + ) + }, + <"DefaultVisibility"> + )> + ] + }, + { + "name" : "operator delete[]", + "qual_name" : [ + "operator delete[]" + ] + }, + { + "type_ptr" : 139 + }, + { + "mangled_name" : "7257393423842453000", + "is_cpp" : true, + "parameters" : [ + <"ParmVarDecl" : ( + { + "pointer" : 147, + "parent_pointer" : 145, + "source_range" : ( + { + }, + { + } + ), + "is_implicit" : true + }, + { + "name" : "", + "qual_name" : [ + "" + ] + }, + { + "type_ptr" : 136 + }, + { + "parm_index_in_function" : 0 + } + )>, + <"ParmVarDecl" : ( + { + "pointer" : 148, + "parent_pointer" : 145, + "source_range" : ( + { + }, + { + } + ), + "is_implicit" : true + }, + { + "name" : "", + "qual_name" : [ + "" + ] + }, + { + "type_ptr" : 68 + }, + { + "parm_index_in_function" : 0 + } + )> + ] + } + )>, + <"FunctionDecl" : ( + { + "pointer" : 149, "source_range" : ( { "line" : 38, @@ -3445,10 +3629,10 @@ { "mangled_name" : "6095890702841955930", "is_cpp" : true, - "decl_ptr_with_body" : 140, + "decl_ptr_with_body" : 149, "body" : <"CompoundStmt" : ( { - "pointer" : 141, + "pointer" : 150, "source_range" : ( { "line" : 38, @@ -3463,7 +3647,7 @@ [ <"DeclStmt" : ( { - "pointer" : 142, + "pointer" : 151, "source_range" : ( { "line" : 39, @@ -3477,7 +3661,7 @@ [ <"CXXNewExpr" : ( { - "pointer" : 143, + "pointer" : 152, "source_range" : ( { "column" : 13 @@ -3490,7 +3674,7 @@ [ <"ImplicitCastExpr" : ( { - "pointer" : 144, + "pointer" : 153, "source_range" : ( { "column" : 21 @@ -3502,7 +3686,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 145, + "pointer" : 154, "source_range" : ( { }, @@ -3538,7 +3722,7 @@ )>, <"InitListExpr" : ( { - "pointer" : 146, + "pointer" : 155, "source_range" : ( { "column" : 23 @@ -3551,7 +3735,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 147, + "pointer" : 156, "source_range" : ( { "column" : 24 @@ -3575,7 +3759,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 148, + "pointer" : 157, "source_range" : ( { "column" : 27 @@ -3599,7 +3783,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 149, + "pointer" : 158, "source_range" : ( { "column" : 30 @@ -3624,7 +3808,7 @@ ], { "qual_type" : { - "type_ptr" : 150 + "type_ptr" : 159 } } )> @@ -3636,15 +3820,15 @@ }, { "is_array" : true, - "array_size_expr" : 144, - "initializer_expr" : 146 + "array_size_expr" : 153, + "initializer_expr" : 155 } )> ], [ <"VarDecl" : ( { - "pointer" : 151, + "pointer" : 160, "source_range" : ( { "column" : 3 @@ -3666,7 +3850,7 @@ { "init_expr" : <"CXXNewExpr" : ( { - "pointer" : 143, + "pointer" : 152, "source_range" : ( { "column" : 13 @@ -3679,7 +3863,7 @@ [ <"ImplicitCastExpr" : ( { - "pointer" : 144, + "pointer" : 153, "source_range" : ( { "column" : 21 @@ -3691,7 +3875,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 145, + "pointer" : 154, "source_range" : ( { }, @@ -3727,7 +3911,7 @@ )>, <"InitListExpr" : ( { - "pointer" : 146, + "pointer" : 155, "source_range" : ( { "column" : 23 @@ -3740,7 +3924,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 147, + "pointer" : 156, "source_range" : ( { "column" : 24 @@ -3764,7 +3948,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 148, + "pointer" : 157, "source_range" : ( { "column" : 27 @@ -3788,7 +3972,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 149, + "pointer" : 158, "source_range" : ( { "column" : 30 @@ -3813,7 +3997,7 @@ ], { "qual_type" : { - "type_ptr" : 150 + "type_ptr" : 159 } } )> @@ -3825,8 +4009,8 @@ }, { "is_array" : true, - "array_size_expr" : 144, - "initializer_expr" : 146 + "array_size_expr" : 153, + "initializer_expr" : 155 } )> } @@ -3835,7 +4019,7 @@ )>, <"DeclStmt" : ( { - "pointer" : 152, + "pointer" : 161, "source_range" : ( { "line" : 40, @@ -3849,7 +4033,7 @@ [ <"CXXNewExpr" : ( { - "pointer" : 153, + "pointer" : 162, "source_range" : ( { "column" : 13 @@ -3862,7 +4046,7 @@ [ <"CXXConstructExpr" : ( { - "pointer" : 154, + "pointer" : 163, "source_range" : ( { "column" : 17 @@ -3875,7 +4059,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 155, + "pointer" : 164, "source_range" : ( { "column" : 25 @@ -3899,7 +4083,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 156, + "pointer" : 165, "source_range" : ( { "column" : 28 @@ -3951,14 +4135,14 @@ } }, { - "initializer_expr" : 154 + "initializer_expr" : 163 } )> ], [ <"VarDecl" : ( { - "pointer" : 157, + "pointer" : 166, "source_range" : ( { "column" : 3 @@ -3980,7 +4164,7 @@ { "init_expr" : <"CXXNewExpr" : ( { - "pointer" : 153, + "pointer" : 162, "source_range" : ( { "column" : 13 @@ -3993,7 +4177,7 @@ [ <"CXXConstructExpr" : ( { - "pointer" : 154, + "pointer" : 163, "source_range" : ( { "column" : 17 @@ -4006,7 +4190,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 155, + "pointer" : 164, "source_range" : ( { "column" : 25 @@ -4030,7 +4214,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 156, + "pointer" : 165, "source_range" : ( { "column" : 28 @@ -4082,7 +4266,7 @@ } }, { - "initializer_expr" : 154 + "initializer_expr" : 163 } )> } @@ -4091,7 +4275,7 @@ )>, <"DeclStmt" : ( { - "pointer" : 158, + "pointer" : 167, "source_range" : ( { "line" : 41, @@ -4105,7 +4289,7 @@ [ <"CXXNewExpr" : ( { - "pointer" : 159, + "pointer" : 168, "source_range" : ( { "column" : 15 @@ -4118,7 +4302,7 @@ [ <"ImplicitCastExpr" : ( { - "pointer" : 160, + "pointer" : 169, "source_range" : ( { "column" : 27 @@ -4130,7 +4314,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 161, + "pointer" : 170, "source_range" : ( { }, @@ -4166,7 +4350,7 @@ )>, <"InitListExpr" : ( { - "pointer" : 162, + "pointer" : 171, "source_range" : ( { "column" : 29 @@ -4179,7 +4363,7 @@ [ <"CXXConstructExpr" : ( { - "pointer" : 163, + "pointer" : 172, "source_range" : ( { "column" : 30 @@ -4192,7 +4376,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 164, + "pointer" : 173, "source_range" : ( { "column" : 31 @@ -4216,7 +4400,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 165, + "pointer" : 174, "source_range" : ( { "column" : 34 @@ -4263,7 +4447,7 @@ )>, <"CXXConstructExpr" : ( { - "pointer" : 166, + "pointer" : 175, "source_range" : ( { "column" : 38 @@ -4276,7 +4460,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 167, + "pointer" : 176, "source_range" : ( { "column" : 39 @@ -4300,7 +4484,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 168, + "pointer" : 177, "source_range" : ( { "column" : 42 @@ -4347,7 +4531,7 @@ )>, <"CXXConstructExpr" : ( { - "pointer" : 169, + "pointer" : 178, "source_range" : ( { "column" : 46 @@ -4360,7 +4544,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 170, + "pointer" : 179, "source_range" : ( { "column" : 47 @@ -4384,7 +4568,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 171, + "pointer" : 180, "source_range" : ( { "column" : 50 @@ -4432,7 +4616,7 @@ ], { "qual_type" : { - "type_ptr" : 172 + "type_ptr" : 181 } } )> @@ -4444,15 +4628,15 @@ }, { "is_array" : true, - "array_size_expr" : 160, - "initializer_expr" : 162 + "array_size_expr" : 169, + "initializer_expr" : 171 } )> ], [ <"VarDecl" : ( { - "pointer" : 173, + "pointer" : 182, "source_range" : ( { "column" : 3 @@ -4474,7 +4658,7 @@ { "init_expr" : <"CXXNewExpr" : ( { - "pointer" : 159, + "pointer" : 168, "source_range" : ( { "column" : 15 @@ -4487,7 +4671,7 @@ [ <"ImplicitCastExpr" : ( { - "pointer" : 160, + "pointer" : 169, "source_range" : ( { "column" : 27 @@ -4499,7 +4683,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 161, + "pointer" : 170, "source_range" : ( { }, @@ -4535,7 +4719,7 @@ )>, <"InitListExpr" : ( { - "pointer" : 162, + "pointer" : 171, "source_range" : ( { "column" : 29 @@ -4548,7 +4732,7 @@ [ <"CXXConstructExpr" : ( { - "pointer" : 163, + "pointer" : 172, "source_range" : ( { "column" : 30 @@ -4561,7 +4745,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 164, + "pointer" : 173, "source_range" : ( { "column" : 31 @@ -4585,7 +4769,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 165, + "pointer" : 174, "source_range" : ( { "column" : 34 @@ -4632,7 +4816,7 @@ )>, <"CXXConstructExpr" : ( { - "pointer" : 166, + "pointer" : 175, "source_range" : ( { "column" : 38 @@ -4645,7 +4829,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 167, + "pointer" : 176, "source_range" : ( { "column" : 39 @@ -4669,7 +4853,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 168, + "pointer" : 177, "source_range" : ( { "column" : 42 @@ -4716,7 +4900,7 @@ )>, <"CXXConstructExpr" : ( { - "pointer" : 169, + "pointer" : 178, "source_range" : ( { "column" : 46 @@ -4729,7 +4913,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 170, + "pointer" : 179, "source_range" : ( { "column" : 47 @@ -4753,7 +4937,7 @@ )>, <"IntegerLiteral" : ( { - "pointer" : 171, + "pointer" : 180, "source_range" : ( { "column" : 50 @@ -4801,7 +4985,7 @@ ], { "qual_type" : { - "type_ptr" : 172 + "type_ptr" : 181 } } )> @@ -4813,8 +4997,8 @@ }, { "is_array" : true, - "array_size_expr" : 160, - "initializer_expr" : 162 + "array_size_expr" : 169, + "initializer_expr" : 171 } )> } @@ -4827,7 +5011,7 @@ )>, <"FunctionDecl" : ( { - "pointer" : 174, + "pointer" : 183, "source_range" : ( { "line" : 45, @@ -4848,7 +5032,7 @@ ] }, { - "type_ptr" : 175 + "type_ptr" : 184 }, { "mangled_name" : "13351464032276683690", @@ -4856,8 +5040,8 @@ "parameters" : [ <"ParmVarDecl" : ( { - "pointer" : 176, - "parent_pointer" : 174, + "pointer" : 185, + "parent_pointer" : 183, "source_range" : ( { "line" : 45, @@ -4883,8 +5067,8 @@ )>, <"ParmVarDecl" : ( { - "pointer" : 177, - "parent_pointer" : 174, + "pointer" : 186, + "parent_pointer" : 183, "source_range" : ( { "column" : 40 @@ -4909,8 +5093,8 @@ )>, <"ParmVarDecl" : ( { - "pointer" : 178, - "parent_pointer" : 174, + "pointer" : 187, + "parent_pointer" : 183, "source_range" : ( { "column" : 51 @@ -4936,10 +5120,10 @@ } )> ], - "decl_ptr_with_body" : 174, + "decl_ptr_with_body" : 183, "body" : <"CompoundStmt" : ( { - "pointer" : 179, + "pointer" : 188, "source_range" : ( { "column" : 72 @@ -4953,7 +5137,7 @@ [ <"ReturnStmt" : ( { - "pointer" : 180, + "pointer" : 189, "source_range" : ( { "line" : 46, @@ -4967,7 +5151,7 @@ [ <"ImplicitCastExpr" : ( { - "pointer" : 181, + "pointer" : 190, "source_range" : ( { }, @@ -4978,7 +5162,7 @@ [ <"DeclRefExpr" : ( { - "pointer" : 182, + "pointer" : 191, "source_range" : ( { }, @@ -4997,7 +5181,7 @@ { "decl_ref" : { "kind" : <"ParmVar">, - "decl_pointer" : 178, + "decl_pointer" : 187, "name" : { "name" : "ptr2", "qual_name" : [ @@ -5031,7 +5215,7 @@ )>, <"EmptyDecl" : ( { - "pointer" : 183, + "pointer" : 192, "source_range" : ( { "line" : 47, @@ -5044,7 +5228,7 @@ )>, <"FunctionDecl" : ( { - "pointer" : 184, + "pointer" : 193, "source_range" : ( { "line" : 49, @@ -5063,7 +5247,7 @@ ] }, { - "type_ptr" : 185 + "type_ptr" : 194 }, { "mangled_name" : "1553186570458038035", @@ -5071,8 +5255,8 @@ "parameters" : [ <"ParmVarDecl" : ( { - "pointer" : 186, - "parent_pointer" : 184, + "pointer" : 195, + "parent_pointer" : 193, "source_range" : ( { "line" : 49, @@ -5099,10 +5283,10 @@ } )> ], - "decl_ptr_with_body" : 184, + "decl_ptr_with_body" : 193, "body" : <"CompoundStmt" : ( { - "pointer" : 187, + "pointer" : 196, "source_range" : ( { "column" : 32 @@ -5116,7 +5300,7 @@ [ <"DeclStmt" : ( { - "pointer" : 188, + "pointer" : 197, "source_range" : ( { "line" : 50, @@ -5130,7 +5314,7 @@ [ <"IntegerLiteral" : ( { - "pointer" : 189, + "pointer" : 198, "source_range" : ( { "column" : 11 @@ -5156,7 +5340,7 @@ [ <"VarDecl" : ( { - "pointer" : 190, + "pointer" : 199, "source_range" : ( { "column" : 3 @@ -5181,7 +5365,7 @@ "is_init_ice" : true, "init_expr" : <"IntegerLiteral" : ( { - "pointer" : 189, + "pointer" : 198, "source_range" : ( { }, @@ -5208,7 +5392,7 @@ )>, <"DeclStmt" : ( { - "pointer" : 191, + "pointer" : 200, "source_range" : ( { "line" : 51, @@ -5222,7 +5406,7 @@ [ <"CXXNewExpr" : ( { - "pointer" : 192, + "pointer" : 201, "source_range" : ( { "column" : 13 @@ -5235,7 +5419,7 @@ [ <"CXXConstructExpr" : ( { - "pointer" : 193, + "pointer" : 202, "source_range" : ( { }, @@ -5269,7 +5453,7 @@ )>, <"ImplicitCastExpr" : ( { - "pointer" : 194, + "pointer" : 203, "source_range" : ( { "column" : 18 @@ -5281,7 +5465,7 @@ [ <"DeclRefExpr" : ( { - "pointer" : 195, + "pointer" : 204, "source_range" : ( { }, @@ -5300,7 +5484,7 @@ { "decl_ref" : { "kind" : <"ParmVar">, - "decl_pointer" : 186, + "decl_pointer" : 195, "name" : { "name" : "ptr", "qual_name" : [ @@ -5328,7 +5512,7 @@ )>, <"ImplicitCastExpr" : ( { - "pointer" : 196, + "pointer" : 205, "source_range" : ( { "column" : 23 @@ -5341,7 +5525,7 @@ [ <"UnaryOperator" : ( { - "pointer" : 197, + "pointer" : 206, "source_range" : ( { "column" : 23 @@ -5354,7 +5538,7 @@ [ <"DeclRefExpr" : ( { - "pointer" : 198, + "pointer" : 207, "source_range" : ( { }, @@ -5373,7 +5557,7 @@ { "decl_ref" : { "kind" : <"Var">, - "decl_pointer" : 190, + "decl_pointer" : 199, "name" : { "name" : "i", "qual_name" : [ @@ -5416,10 +5600,10 @@ } }, { - "initializer_expr" : 193, + "initializer_expr" : 202, "placement_args" : [ - 194, - 196 + 203, + 205 ] } )> @@ -5427,7 +5611,7 @@ [ <"VarDecl" : ( { - "pointer" : 199, + "pointer" : 208, "source_range" : ( { "column" : 3 @@ -5449,7 +5633,7 @@ { "init_expr" : <"CXXNewExpr" : ( { - "pointer" : 192, + "pointer" : 201, "source_range" : ( { "column" : 13 @@ -5462,7 +5646,7 @@ [ <"CXXConstructExpr" : ( { - "pointer" : 193, + "pointer" : 202, "source_range" : ( { }, @@ -5496,7 +5680,7 @@ )>, <"ImplicitCastExpr" : ( { - "pointer" : 194, + "pointer" : 203, "source_range" : ( { "column" : 18 @@ -5508,7 +5692,7 @@ [ <"DeclRefExpr" : ( { - "pointer" : 195, + "pointer" : 204, "source_range" : ( { }, @@ -5527,7 +5711,7 @@ { "decl_ref" : { "kind" : <"ParmVar">, - "decl_pointer" : 186, + "decl_pointer" : 195, "name" : { "name" : "ptr", "qual_name" : [ @@ -5555,7 +5739,7 @@ )>, <"ImplicitCastExpr" : ( { - "pointer" : 196, + "pointer" : 205, "source_range" : ( { "column" : 23 @@ -5568,7 +5752,7 @@ [ <"UnaryOperator" : ( { - "pointer" : 197, + "pointer" : 206, "source_range" : ( { "column" : 23 @@ -5581,7 +5765,7 @@ [ <"DeclRefExpr" : ( { - "pointer" : 198, + "pointer" : 207, "source_range" : ( { }, @@ -5600,7 +5784,7 @@ { "decl_ref" : { "kind" : <"Var">, - "decl_pointer" : 190, + "decl_pointer" : 199, "name" : { "name" : "i", "qual_name" : [ @@ -5643,10 +5827,10 @@ } }, { - "initializer_expr" : 193, + "initializer_expr" : 202, "placement_args" : [ - 194, - 196 + 203, + 205 ] } )> @@ -5660,7 +5844,7 @@ )>, <"TypedefDecl" : ( { - "pointer" : 200, + "pointer" : 209, "source_range" : ( { }, @@ -5675,7 +5859,7 @@ "instancetype" ] }, - 201, + 210, { } )> @@ -5701,25 +5885,25 @@ )>, <"BuiltinType" : ( { - "pointer" : 202 + "pointer" : 211 }, <"Bool"> )>, <"BuiltinType" : ( { - "pointer" : 203 + "pointer" : 212 }, <"Char_S"> )>, <"BuiltinType" : ( { - "pointer" : 204 + "pointer" : 213 }, <"SChar"> )>, <"BuiltinType" : ( { - "pointer" : 205 + "pointer" : 214 }, <"Short"> )>, @@ -5731,31 +5915,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 206 + "pointer" : 215 }, <"Long"> )>, <"BuiltinType" : ( { - "pointer" : 207 + "pointer" : 216 }, <"LongLong"> )>, <"BuiltinType" : ( { - "pointer" : 208 + "pointer" : 217 }, <"UChar"> )>, <"BuiltinType" : ( { - "pointer" : 209 + "pointer" : 218 }, <"UShort"> )>, <"BuiltinType" : ( { - "pointer" : 210 + "pointer" : 219 }, <"UInt"> )>, @@ -5767,283 +5951,289 @@ )>, <"BuiltinType" : ( { - "pointer" : 211 + "pointer" : 220 }, <"ULongLong"> )>, <"BuiltinType" : ( { - "pointer" : 212 + "pointer" : 221 }, <"Float"> )>, <"BuiltinType" : ( { - "pointer" : 213 + "pointer" : 222 }, <"Double"> )>, <"BuiltinType" : ( { - "pointer" : 214 + "pointer" : 223 }, <"LongDouble"> )>, <"BuiltinType" : ( { - "pointer" : 215 + "pointer" : 224 }, <"Float128"> )>, <"BuiltinType" : ( { - "pointer" : 216 + "pointer" : 225 }, <"Ibm128"> )>, <"BuiltinType" : ( { - "pointer" : 217 + "pointer" : 226 }, <"Float16"> )>, <"BuiltinType" : ( { - "pointer" : 218 + "pointer" : 227 }, <"ShortAccum"> )>, <"BuiltinType" : ( { - "pointer" : 219 + "pointer" : 228 }, <"Accum"> )>, <"BuiltinType" : ( { - "pointer" : 220 + "pointer" : 229 }, <"LongAccum"> )>, <"BuiltinType" : ( { - "pointer" : 221 + "pointer" : 230 }, <"UShortAccum"> )>, <"BuiltinType" : ( { - "pointer" : 222 + "pointer" : 231 }, <"UAccum"> )>, <"BuiltinType" : ( { - "pointer" : 223 + "pointer" : 232 }, <"ULongAccum"> )>, <"BuiltinType" : ( { - "pointer" : 224 + "pointer" : 233 }, <"ShortFract"> )>, <"BuiltinType" : ( { - "pointer" : 225 + "pointer" : 234 }, <"Fract"> )>, <"BuiltinType" : ( { - "pointer" : 226 + "pointer" : 235 }, <"LongFract"> )>, <"BuiltinType" : ( { - "pointer" : 227 + "pointer" : 236 }, <"UShortFract"> )>, <"BuiltinType" : ( { - "pointer" : 228 + "pointer" : 237 }, <"UFract"> )>, <"BuiltinType" : ( { - "pointer" : 229 + "pointer" : 238 }, <"ULongFract"> )>, <"BuiltinType" : ( { - "pointer" : 230 + "pointer" : 239 }, <"SatShortAccum"> )>, <"BuiltinType" : ( { - "pointer" : 231 + "pointer" : 240 }, <"SatAccum"> )>, <"BuiltinType" : ( { - "pointer" : 232 + "pointer" : 241 }, <"SatLongAccum"> )>, <"BuiltinType" : ( { - "pointer" : 233 + "pointer" : 242 }, <"SatUShortAccum"> )>, <"BuiltinType" : ( { - "pointer" : 234 + "pointer" : 243 }, <"SatUAccum"> )>, <"BuiltinType" : ( { - "pointer" : 235 + "pointer" : 244 }, <"SatULongAccum"> )>, <"BuiltinType" : ( { - "pointer" : 236 + "pointer" : 245 }, <"SatShortFract"> )>, <"BuiltinType" : ( { - "pointer" : 237 + "pointer" : 246 }, <"SatFract"> )>, <"BuiltinType" : ( { - "pointer" : 238 + "pointer" : 247 }, <"SatLongFract"> )>, <"BuiltinType" : ( { - "pointer" : 239 + "pointer" : 248 }, <"SatUShortFract"> )>, <"BuiltinType" : ( { - "pointer" : 240 + "pointer" : 249 }, <"SatUFract"> )>, <"BuiltinType" : ( { - "pointer" : 241 + "pointer" : 250 }, <"SatULongFract"> )>, <"BuiltinType" : ( { - "pointer" : 242 + "pointer" : 251 }, <"Int128"> )>, <"BuiltinType" : ( { - "pointer" : 243 + "pointer" : 252 }, <"UInt128"> )>, <"BuiltinType" : ( { - "pointer" : 244 + "pointer" : 253 }, <"WChar_S"> )>, <"BuiltinType" : ( { - "pointer" : 245 + "pointer" : 254 }, <"Char8"> )>, <"BuiltinType" : ( { - "pointer" : 246 + "pointer" : 255 }, <"Char16"> )>, <"BuiltinType" : ( { - "pointer" : 247 + "pointer" : 256 }, <"Char32"> )>, <"BuiltinType" : ( { - "pointer" : 248 + "pointer" : 257 }, <"Dependent"> )>, <"BuiltinType" : ( { - "pointer" : 249 + "pointer" : 258 }, <"Overload"> )>, <"BuiltinType" : ( { - "pointer" : 250 + "pointer" : 259 }, <"BoundMember"> )>, <"BuiltinType" : ( { - "pointer" : 251 + "pointer" : 260 + }, + <"UnresolvedTemplate"> + )>, + <"BuiltinType" : ( + { + "pointer" : 261 }, <"PseudoObject"> )>, <"BuiltinType" : ( { - "pointer" : 252 + "pointer" : 262 }, <"UnknownAny"> )>, <"BuiltinType" : ( { - "pointer" : 253 + "pointer" : 263 }, <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { - "pointer" : 254 + "pointer" : 264 }, <"BuiltinFn"> )>, <"BuiltinType" : ( { - "pointer" : 255 + "pointer" : 265 }, <"ObjCId"> )>, <"BuiltinType" : ( { - "pointer" : 256 + "pointer" : 266 }, <"ObjCClass"> )>, <"BuiltinType" : ( { - "pointer" : 257 + "pointer" : 267 }, <"ObjCSel"> )>, @@ -6057,31 +6247,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 258 + "pointer" : 268 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 259 + "pointer" : 269 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 260 + "pointer" : 270 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 261 + "pointer" : 271 }, - 262 + 272 )>, <"PointerType" : ( { - "pointer" : 263 + "pointer" : 273 }, { "type_ptr" : 11, @@ -6090,34 +6280,34 @@ )>, <"PointerType" : ( { - "pointer" : 264 + "pointer" : 274 }, { - "type_ptr" : 203, + "type_ptr" : 212, "is_const" : true } )>, <"PointerType" : ( { - "pointer" : 265 + "pointer" : 275 }, { - "type_ptr" : 203 + "type_ptr" : 212 } )>, <"RecordType" : ( { - "pointer" : 266 + "pointer" : 276 }, - 267 + 277 )>, <"ConstantArrayType" : ( { - "pointer" : 268 + "pointer" : 278 }, { "element_type" : { - "type_ptr" : 266 + "type_ptr" : 276 }, "stride" : 24 }, @@ -6143,7 +6333,7 @@ )>, <"PointerType" : ( { - "pointer" : 269 + "pointer" : 279 }, { "type_ptr" : 25 @@ -6183,7 +6373,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 270 + "pointer" : 280 }, { "return_type" : { @@ -6195,7 +6385,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 271 + "pointer" : 281 }, { "type_ptr" : 8, @@ -6213,7 +6403,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 272 + "pointer" : 282 }, { "return_type" : { @@ -6223,7 +6413,7 @@ { "params_type" : [ { - "type_ptr" : 271 + "type_ptr" : 281 } ] } @@ -6247,7 +6437,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 273 + "pointer" : 283 }, { "type_ptr" : 8 @@ -6263,7 +6453,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 274 + "pointer" : 284 }, { "return_type" : { @@ -6273,7 +6463,7 @@ { "params_type" : [ { - "type_ptr" : 273 + "type_ptr" : 283 } ] } @@ -6309,7 +6499,7 @@ )>, <"PointerType" : ( { - "pointer" : 275 + "pointer" : 285 }, { "type_ptr" : 8 @@ -6325,7 +6515,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 276 + "pointer" : 286 }, { "type_ptr" : 8 @@ -6333,10 +6523,10 @@ )>, <"PointerType" : ( { - "pointer" : 277 + "pointer" : 287 }, { - "type_ptr" : 278 + "type_ptr" : 288 } )>, <"PointerType" : ( @@ -6366,7 +6556,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 185 + "pointer" : 194 }, { "return_type" : { @@ -6398,36 +6588,76 @@ ] } )>, + <"FunctionProtoType" : ( + { + "pointer" : 289 + }, + { + "return_type" : { + "type_ptr" : 102 + } + }, + { + "params_type" : [ + { + "type_ptr" : 136 + }, + { + "type_ptr" : 68 + } + ] + } + )>, + <"FunctionProtoType" : ( + { + "pointer" : 139 + }, + { + "return_type" : { + "type_ptr" : 102 + } + }, + { + "params_type" : [ + { + "type_ptr" : 136 + }, + { + "type_ptr" : 68 + } + ] + } + )>, <"TemplateTypeParmType" : ( { - "pointer" : 279 + "pointer" : 290 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 280 + "pointer" : 291 } )>, <"AutoType" : ( { - "pointer" : 281, - "desugared_type" : 280 + "pointer" : 292, + "desugared_type" : 291 } )>, <"PointerType" : ( { - "pointer" : 282 + "pointer" : 293 }, { - "type_ptr" : 279 + "type_ptr" : 290 } )>, <"PointerType" : ( { - "pointer" : 283 + "pointer" : 294 }, { - "type_ptr" : 281 + "type_ptr" : 292 } )>, <"AutoType" : ( @@ -6446,7 +6676,7 @@ )>, <"ConstantArrayType" : ( { - "pointer" : 284 + "pointer" : 295 }, { "element_type" : { @@ -6458,40 +6688,40 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 285 + "pointer" : 296 } )>, <"AutoType" : ( { - "pointer" : 286, - "desugared_type" : 285 + "pointer" : 297, + "desugared_type" : 296 } )>, <"PointerType" : ( { - "pointer" : 287 + "pointer" : 298 }, { - "type_ptr" : 286 + "type_ptr" : 297 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 288 + "pointer" : 299 } )>, <"AutoType" : ( { - "pointer" : 289, - "desugared_type" : 288 + "pointer" : 300, + "desugared_type" : 299 } )>, <"PointerType" : ( { - "pointer" : 290 + "pointer" : 301 }, { - "type_ptr" : 289 + "type_ptr" : 300 } )>, <"AutoType" : ( @@ -6510,7 +6740,7 @@ )>, <"ConstantArrayType" : ( { - "pointer" : 291 + "pointer" : 302 }, { "element_type" : { @@ -6534,15 +6764,15 @@ )>, <"PointerType" : ( { - "pointer" : 292 + "pointer" : 303 }, { - "type_ptr" : 291 + "type_ptr" : 302 } )>, <"PointerType" : ( { - "pointer" : 293 + "pointer" : 304 }, { "type_ptr" : 81 @@ -6550,7 +6780,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 294 + "pointer" : 305 }, { "return_type" : { @@ -6562,21 +6792,21 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 295 + "pointer" : 306 } )>, <"AutoType" : ( { - "pointer" : 296, - "desugared_type" : 295 + "pointer" : 307, + "desugared_type" : 306 } )>, <"PointerType" : ( { - "pointer" : 297 + "pointer" : 308 }, { - "type_ptr" : 296 + "type_ptr" : 307 } )>, <"ElaboratedType" : ( @@ -6595,7 +6825,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 298 + "pointer" : 309 }, { "type_ptr" : 25, @@ -6613,7 +6843,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 299 + "pointer" : 310 }, { "return_type" : { @@ -6623,7 +6853,7 @@ { "params_type" : [ { - "type_ptr" : 298 + "type_ptr" : 309 } ] } @@ -6647,7 +6877,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 300 + "pointer" : 311 }, { "type_ptr" : 25 @@ -6663,7 +6893,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 301 + "pointer" : 312 }, { "return_type" : { @@ -6673,7 +6903,7 @@ { "params_type" : [ { - "type_ptr" : 300 + "type_ptr" : 311 } ] } @@ -6697,7 +6927,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 302 + "pointer" : 313 }, { "type_ptr" : 25 @@ -6705,21 +6935,21 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 303 + "pointer" : 314 } )>, <"AutoType" : ( { - "pointer" : 304, - "desugared_type" : 303 + "pointer" : 315, + "desugared_type" : 314 } )>, <"PointerType" : ( { - "pointer" : 305 + "pointer" : 316 }, { - "type_ptr" : 304 + "type_ptr" : 315 } )>, <"AutoType" : ( @@ -6738,7 +6968,7 @@ )>, <"ConstantArrayType" : ( { - "pointer" : 306 + "pointer" : 317 }, { "element_type" : { @@ -6762,15 +6992,15 @@ )>, <"PointerType" : ( { - "pointer" : 307 + "pointer" : 318 }, { - "type_ptr" : 306 + "type_ptr" : 317 } )>, <"PointerType" : ( { - "pointer" : 308 + "pointer" : 319 }, { "type_ptr" : 97 @@ -6778,7 +7008,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 309 + "pointer" : 320 }, { "return_type" : { @@ -6790,26 +7020,26 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 310 + "pointer" : 321 } )>, <"AutoType" : ( { - "pointer" : 311, - "desugared_type" : 310 + "pointer" : 322, + "desugared_type" : 321 } )>, <"PointerType" : ( { - "pointer" : 312 + "pointer" : 323 }, { - "type_ptr" : 311 + "type_ptr" : 322 } )>, <"ConstantArrayType" : ( { - "pointer" : 150 + "pointer" : 159 }, { "element_type" : { @@ -6821,45 +7051,45 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 313 + "pointer" : 324 } )>, <"AutoType" : ( { - "pointer" : 314, - "desugared_type" : 313 + "pointer" : 325, + "desugared_type" : 324 } )>, <"PointerType" : ( { - "pointer" : 315 + "pointer" : 326 }, { - "type_ptr" : 314 + "type_ptr" : 325 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 316 + "pointer" : 327 } )>, <"AutoType" : ( { - "pointer" : 317, - "desugared_type" : 316 + "pointer" : 328, + "desugared_type" : 327 } )>, <"PointerType" : ( { - "pointer" : 318 + "pointer" : 329 }, { - "type_ptr" : 317 + "type_ptr" : 328 } )>, <"ConstantArrayType" : ( { - "pointer" : 319 + "pointer" : 330 }, { "element_type" : { @@ -6871,7 +7101,7 @@ )>, <"ConstantArrayType" : ( { - "pointer" : 172 + "pointer" : 181 }, { "element_type" : { @@ -6883,26 +7113,26 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 320 + "pointer" : 331 } )>, <"AutoType" : ( { - "pointer" : 321, - "desugared_type" : 320 + "pointer" : 332, + "desugared_type" : 331 } )>, <"PointerType" : ( { - "pointer" : 322 + "pointer" : 333 }, { - "type_ptr" : 321 + "type_ptr" : 332 } )>, <"FunctionProtoType" : ( { - "pointer" : 323 + "pointer" : 334 }, { "return_type" : { @@ -6925,7 +7155,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 175 + "pointer" : 184 }, { "return_type" : { @@ -6948,7 +7178,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 324 + "pointer" : 335 }, { "type_ptr" : 11 @@ -6956,7 +7186,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 325 + "pointer" : 336 }, { "return_type" : { @@ -6979,61 +7209,61 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 326 + "pointer" : 337 } )>, <"AutoType" : ( { - "pointer" : 327, - "desugared_type" : 326 + "pointer" : 338, + "desugared_type" : 337 } )>, <"PointerType" : ( { - "pointer" : 328 + "pointer" : 339 }, { - "type_ptr" : 327 + "type_ptr" : 338 } )>, <"ObjCObjectType" : ( { - "pointer" : 329 + "pointer" : 340 }, { - "base_type" : 255 + "base_type" : 265 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 330 + "pointer" : 341 }, { - "type_ptr" : 329 + "type_ptr" : 340 } )>, <"TypedefType" : ( { - "pointer" : 331, - "desugared_type" : 330 + "pointer" : 342, + "desugared_type" : 341 }, { "child_type" : { - "type_ptr" : 330 + "type_ptr" : 341 }, - "decl_ptr" : 332 + "decl_ptr" : 343 } )>, <"TypedefType" : ( { - "pointer" : 201, - "desugared_type" : 330 + "pointer" : 210, + "desugared_type" : 341 }, { "child_type" : { - "type_ptr" : 331 + "type_ptr" : 342 }, - "decl_ptr" : 200 + "decl_ptr" : 209 } )>, <"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 447d59bfaf5..aab777094a8 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 @@ -707,47 +707,53 @@ { "pointer" : 75 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 76 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 77 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 78 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 79 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 80 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 81 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 82 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 82 + "pointer" : 83 }, { "type_ptr" : 21 @@ -755,31 +761,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 83 + "pointer" : 84 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 84 + "pointer" : 85 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 85 + "pointer" : 86 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 86 + "pointer" : 87 }, - 87 + 88 )>, <"PointerType" : ( { - "pointer" : 88 + "pointer" : 89 }, { "type_ptr" : 23, @@ -788,7 +794,7 @@ )>, <"PointerType" : ( { - "pointer" : 89 + "pointer" : 90 }, { "type_ptr" : 26, @@ -797,7 +803,7 @@ )>, <"PointerType" : ( { - "pointer" : 90 + "pointer" : 91 }, { "type_ptr" : 26 @@ -805,17 +811,17 @@ )>, <"RecordType" : ( { - "pointer" : 91 + "pointer" : 92 }, - 92 + 93 )>, <"ConstantArrayType" : ( { - "pointer" : 93 + "pointer" : 94 }, { "element_type" : { - "type_ptr" : 91 + "type_ptr" : 92 }, "stride" : 24 }, @@ -823,7 +829,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 94 + "pointer" : 95 }, { "return_type" : { @@ -859,18 +865,18 @@ )>, <"PointerType" : ( { - "pointer" : 95 + "pointer" : 96 }, { - "type_ptr" : 90 + "type_ptr" : 91 } )>, <"PointerType" : ( { - "pointer" : 96 + "pointer" : 97 }, { - "type_ptr" : 94 + "type_ptr" : 95 } )>, <"PointerType" : ( @@ -883,40 +889,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 97 + "pointer" : 98 }, { - "base_type" : 79 + "base_type" : 80 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 98 + "pointer" : 99 }, { - "type_ptr" : 97 + "type_ptr" : 98 } )>, <"TypedefType" : ( { - "pointer" : 99, - "desugared_type" : 98 + "pointer" : 100, + "desugared_type" : 99 }, { "child_type" : { - "type_ptr" : 98 + "type_ptr" : 99 }, - "decl_ptr" : 100 + "decl_ptr" : 101 } )>, <"TypedefType" : ( { "pointer" : 25, - "desugared_type" : 98 + "desugared_type" : 99 }, { "child_type" : { - "type_ptr" : 99 + "type_ptr" : 100 }, "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 16a748076e5..ae86e50b781 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 @@ -578,47 +578,53 @@ { "pointer" : 67 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 68 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 69 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 70 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 71 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 72 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 73 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 74 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 74 + "pointer" : 75 }, { "type_ptr" : 15 @@ -626,77 +632,77 @@ )>, <"BuiltinType" : ( { - "pointer" : 75 + "pointer" : 76 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 76 + "pointer" : 77 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 77 + "pointer" : 78 }, <"BFloat16"> )>, <"PointerType" : ( { - "pointer" : 78 + "pointer" : 79 }, { - "type_ptr" : 73 + "type_ptr" : 74 } )>, <"ObjCObjectType" : ( { - "pointer" : 79 + "pointer" : 80 }, { - "base_type" : 71 + "base_type" : 72 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 80 + "pointer" : 81 }, { - "type_ptr" : 79 + "type_ptr" : 80 } )>, <"ObjCObjectType" : ( { - "pointer" : 81 + "pointer" : 82 }, { - "base_type" : 72 + "base_type" : 73 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 82 + "pointer" : 83 }, { - "type_ptr" : 81 + "type_ptr" : 82 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 83 + "pointer" : 84 }, 8 )>, <"RecordType" : ( { - "pointer" : 84 + "pointer" : 85 }, - 85 + 86 )>, <"PointerType" : ( { - "pointer" : 86 + "pointer" : 87 }, { "type_ptr" : 20, @@ -705,7 +711,7 @@ )>, <"PointerType" : ( { - "pointer" : 87 + "pointer" : 88 }, { "type_ptr" : 17, @@ -714,7 +720,7 @@ )>, <"PointerType" : ( { - "pointer" : 88 + "pointer" : 89 }, { "type_ptr" : 17 @@ -722,17 +728,17 @@ )>, <"RecordType" : ( { - "pointer" : 89 + "pointer" : 90 }, - 90 + 91 )>, <"ConstantArrayType" : ( { - "pointer" : 91 + "pointer" : 92 }, { "element_type" : { - "type_ptr" : 89 + "type_ptr" : 90 }, "stride" : 24 }, @@ -740,44 +746,44 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 92 + "pointer" : 93 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 93 + "pointer" : 94 } )>, <"FunctionProtoType" : ( { - "pointer" : 94 + "pointer" : 95 }, { "return_type" : { - "type_ptr" : 74 + "type_ptr" : 75 } }, { "params_type" : [ { - "type_ptr" : 92 + "type_ptr" : 93 } ] } )>, <"FunctionProtoType" : ( { - "pointer" : 95 + "pointer" : 96 }, { "return_type" : { - "type_ptr" : 74 + "type_ptr" : 75 } }, { "params_type" : [ { - "type_ptr" : 93 + "type_ptr" : 94 } ] } @@ -785,11 +791,11 @@ <"TypedefType" : ( { "pointer" : 6, - "desugared_type" : 80 + "desugared_type" : 81 }, { "child_type" : { - "type_ptr" : 80 + "type_ptr" : 81 }, "decl_ptr" : 5 } @@ -797,7 +803,7 @@ <"TypedefType" : ( { "pointer" : 14, - "desugared_type" : 80 + "desugared_type" : 81 }, { "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 d98858d2da5..65402422a7a 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/optional.m.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/optional.m.exp @@ -1834,6 +1834,12 @@ }, <"BoundMember"> )>, + <"BuiltinType" : ( + { + "pointer" : 101 + }, + <"UnresolvedTemplate"> + )>, <"BuiltinType" : ( { "pointer" : 44 @@ -1842,43 +1848,43 @@ )>, <"BuiltinType" : ( { - "pointer" : 101 + "pointer" : 102 }, <"UnknownAny"> )>, <"BuiltinType" : ( { - "pointer" : 102 + "pointer" : 103 }, <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { - "pointer" : 103 + "pointer" : 104 }, <"BuiltinFn"> )>, <"BuiltinType" : ( { - "pointer" : 104 + "pointer" : 105 }, <"ObjCId"> )>, <"BuiltinType" : ( { - "pointer" : 105 + "pointer" : 106 }, <"ObjCClass"> )>, <"BuiltinType" : ( { - "pointer" : 106 + "pointer" : 107 }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 107 + "pointer" : 108 }, { "type_ptr" : 17 @@ -1886,77 +1892,77 @@ )>, <"BuiltinType" : ( { - "pointer" : 108 + "pointer" : 109 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 109 + "pointer" : 110 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 110 + "pointer" : 111 }, <"BFloat16"> )>, <"PointerType" : ( { - "pointer" : 111 + "pointer" : 112 }, { - "type_ptr" : 106 + "type_ptr" : 107 } )>, <"ObjCObjectType" : ( { - "pointer" : 112 + "pointer" : 113 }, { - "base_type" : 104 + "base_type" : 105 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 113 + "pointer" : 114 }, { - "type_ptr" : 112 + "type_ptr" : 113 } )>, <"ObjCObjectType" : ( { - "pointer" : 114 + "pointer" : 115 }, { - "base_type" : 105 + "base_type" : 106 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 115 + "pointer" : 116 }, { - "type_ptr" : 114 + "type_ptr" : 115 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 116 + "pointer" : 117 }, 9 )>, <"RecordType" : ( { - "pointer" : 117 + "pointer" : 118 }, - 118 + 119 )>, <"PointerType" : ( { - "pointer" : 119 + "pointer" : 120 }, { "type_ptr" : 56, @@ -1965,7 +1971,7 @@ )>, <"PointerType" : ( { - "pointer" : 120 + "pointer" : 121 }, { "type_ptr" : 53, @@ -1974,7 +1980,7 @@ )>, <"PointerType" : ( { - "pointer" : 121 + "pointer" : 122 }, { "type_ptr" : 53 @@ -1982,17 +1988,17 @@ )>, <"RecordType" : ( { - "pointer" : 122 + "pointer" : 123 }, - 123 + 124 )>, <"ConstantArrayType" : ( { - "pointer" : 124 + "pointer" : 125 }, { "element_type" : { - "type_ptr" : 122 + "type_ptr" : 123 }, "stride" : 24 }, @@ -2000,18 +2006,18 @@ )>, <"ObjCInterfaceType" : ( { - "pointer" : 125 + "pointer" : 126 }, 13 )>, <"TypedefType" : ( { "pointer" : 7, - "desugared_type" : 113 + "desugared_type" : 114 }, { "child_type" : { - "type_ptr" : 113 + "type_ptr" : 114 }, "decl_ptr" : 6 } @@ -2019,7 +2025,7 @@ <"TypedefType" : ( { "pointer" : 51, - "desugared_type" : 113 + "desugared_type" : 114 }, { "child_type" : { @@ -2031,33 +2037,33 @@ <"TypedefType" : ( { "pointer" : 5, - "desugared_type" : 111 + "desugared_type" : 112 }, { "child_type" : { - "type_ptr" : 111 + "type_ptr" : 112 }, "decl_ptr" : 4 } )>, <"ObjCInterfaceType" : ( { - "pointer" : 126 + "pointer" : 127 }, 20 )>, <"ElaboratedType" : ( { - "pointer" : 127, - "desugared_type" : 113 + "pointer" : 128, + "desugared_type" : 114 } )>, <"ObjCObjectType" : ( { - "pointer" : 128 + "pointer" : 129 }, { - "base_type" : 104, + "base_type" : 105, "protocol_decls_ptr" : [ 15 ] @@ -2068,7 +2074,7 @@ "pointer" : 22 }, { - "type_ptr" : 128 + "type_ptr" : 129 } )>, <"ObjCObjectPointerType" : ( @@ -2076,7 +2082,7 @@ "pointer" : 27 }, { - "type_ptr" : 126 + "type_ptr" : 127 } )>, <"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 72ad6e7bea1..3090c8cbaa0 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 @@ -796,47 +796,53 @@ { "pointer" : 77 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 78 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 79 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 80 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 81 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 82 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 83 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 84 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 84 + "pointer" : 85 }, { "type_ptr" : 28 @@ -844,31 +850,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 85 + "pointer" : 86 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 86 + "pointer" : 87 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 87 + "pointer" : 88 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 88 + "pointer" : 89 }, - 89 + 90 )>, <"PointerType" : ( { - "pointer" : 90 + "pointer" : 91 }, { "type_ptr" : 12, @@ -877,7 +883,7 @@ )>, <"PointerType" : ( { - "pointer" : 91 + "pointer" : 92 }, { "type_ptr" : 25, @@ -886,7 +892,7 @@ )>, <"PointerType" : ( { - "pointer" : 92 + "pointer" : 93 }, { "type_ptr" : 25 @@ -894,17 +900,17 @@ )>, <"RecordType" : ( { - "pointer" : 93 + "pointer" : 94 }, - 94 + 95 )>, <"ConstantArrayType" : ( { - "pointer" : 95 + "pointer" : 96 }, { "element_type" : { - "type_ptr" : 93 + "type_ptr" : 94 }, "stride" : 24 }, @@ -917,22 +923,22 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 96 + "pointer" : 97 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 97 + "pointer" : 98 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 98 + "pointer" : 99 } )>, <"InjectedClassNameType" : ( { - "pointer" : 99 + "pointer" : 100 } )>, <"TemplateTypeParmType" : ( @@ -942,12 +948,12 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 100 + "pointer" : 101 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 101 + "pointer" : 102 } )>, <"InjectedClassNameType" : ( @@ -955,11 +961,6 @@ "pointer" : 9 } )>, - <"TemplateSpecializationType" : ( - { - "pointer" : 102 - } - )>, <"PointerType" : ( { "pointer" : 103 @@ -985,7 +986,7 @@ "pointer" : 104 }, { - "base_type" : 81 + "base_type" : 82 } )>, <"ObjCObjectPointerType" : ( diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/struct.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/struct.cpp.exp index fadfaefc7e5..0c292798f50 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/struct.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/struct.cpp.exp @@ -1377,47 +1377,53 @@ { "pointer" : 104 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 105 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 106 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 107 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 108 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 109 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 110 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 111 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 111 + "pointer" : 112 }, { "type_ptr" : 54 @@ -1425,31 +1431,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 112 + "pointer" : 113 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 113 + "pointer" : 114 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 114 + "pointer" : 115 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 115 + "pointer" : 116 }, - 116 + 117 )>, <"PointerType" : ( { - "pointer" : 117 + "pointer" : 118 }, { "type_ptr" : 44, @@ -1458,7 +1464,7 @@ )>, <"PointerType" : ( { - "pointer" : 118 + "pointer" : 119 }, { "type_ptr" : 56, @@ -1467,7 +1473,7 @@ )>, <"PointerType" : ( { - "pointer" : 119 + "pointer" : 120 }, { "type_ptr" : 56 @@ -1475,17 +1481,17 @@ )>, <"RecordType" : ( { - "pointer" : 120 + "pointer" : 121 }, - 121 + 122 )>, <"ConstantArrayType" : ( { - "pointer" : 122 + "pointer" : 123 }, { "element_type" : { - "type_ptr" : 120 + "type_ptr" : 121 }, "stride" : 24 }, @@ -1523,7 +1529,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 123 + "pointer" : 124 }, { "return_type" : { @@ -1535,7 +1541,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 124 + "pointer" : 125 }, { "type_ptr" : 18, @@ -1553,7 +1559,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 125 + "pointer" : 126 }, { "return_type" : { @@ -1563,7 +1569,7 @@ { "params_type" : [ { - "type_ptr" : 124 + "type_ptr" : 125 } ] } @@ -1587,7 +1593,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 126 + "pointer" : 127 }, { "type_ptr" : 18 @@ -1603,7 +1609,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 127 + "pointer" : 128 }, { "return_type" : { @@ -1613,7 +1619,7 @@ { "params_type" : [ { - "type_ptr" : 126 + "type_ptr" : 127 } ] } @@ -1649,7 +1655,7 @@ )>, <"PointerType" : ( { - "pointer" : 128 + "pointer" : 129 }, { "type_ptr" : 18 @@ -1657,7 +1663,7 @@ )>, <"PointerType" : ( { - "pointer" : 129 + "pointer" : 130 }, { "type_ptr" : 33 @@ -1665,7 +1671,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 130 + "pointer" : 131 }, { "type_ptr" : 18 @@ -1691,40 +1697,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 131 + "pointer" : 132 }, { - "base_type" : 108 + "base_type" : 109 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 132 + "pointer" : 133 }, { - "type_ptr" : 131 + "type_ptr" : 132 } )>, <"TypedefType" : ( { - "pointer" : 133, - "desugared_type" : 132 + "pointer" : 134, + "desugared_type" : 133 }, { "child_type" : { - "type_ptr" : 132 + "type_ptr" : 133 }, - "decl_ptr" : 134 + "decl_ptr" : 135 } )>, <"TypedefType" : ( { "pointer" : 53, - "desugared_type" : 132 + "desugared_type" : 133 }, { "child_type" : { - "type_ptr" : 133 + "type_ptr" : 134 }, "decl_ptr" : 52 } 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 904470da17a..9ad419920aa 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/template_instantiations.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/template_instantiations.cpp.exp @@ -3936,47 +3936,53 @@ { "pointer" : 242 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 243 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 244 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 245 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 246 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 247 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 248 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 249 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 249 + "pointer" : 250 }, { "type_ptr" : 191 @@ -3984,31 +3990,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 250 + "pointer" : 251 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 251 + "pointer" : 252 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 252 + "pointer" : 253 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 253 + "pointer" : 254 }, - 254 + 255 )>, <"PointerType" : ( { - "pointer" : 255 + "pointer" : 256 }, { "type_ptr" : 10, @@ -4017,7 +4023,7 @@ )>, <"PointerType" : ( { - "pointer" : 256 + "pointer" : 257 }, { "type_ptr" : 193, @@ -4026,7 +4032,7 @@ )>, <"PointerType" : ( { - "pointer" : 257 + "pointer" : 258 }, { "type_ptr" : 193 @@ -4034,17 +4040,17 @@ )>, <"RecordType" : ( { - "pointer" : 258 + "pointer" : 259 }, - 259 + 260 )>, <"ConstantArrayType" : ( { - "pointer" : 260 + "pointer" : 261 }, { "element_type" : { - "type_ptr" : 258 + "type_ptr" : 259 }, "stride" : 24 }, @@ -4052,37 +4058,37 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 261 + "pointer" : 262 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 262 + "pointer" : 263 } )>, <"PackExpansionType" : ( { - "pointer" : 263 + "pointer" : 264 } )>, <"PackExpansionType" : ( { - "pointer" : 264 + "pointer" : 265 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 265 + "pointer" : 266 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 266 + "pointer" : 267 } )>, <"InjectedClassNameType" : ( { - "pointer" : 267 + "pointer" : 268 } )>, <"RecordType" : ( @@ -4093,13 +4099,13 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 268, + "pointer" : 269, "desugared_type" : 9 } )>, <"ElaboratedType" : ( { - "pointer" : 269, + "pointer" : 270, "desugared_type" : 9 } )>, @@ -4111,7 +4117,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 270, + "pointer" : 271, "desugared_type" : 12 } )>, @@ -4123,7 +4129,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 271 + "pointer" : 272 }, { "return_type" : { @@ -4135,7 +4141,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 272 + "pointer" : 273 }, { "return_type" : { @@ -4147,13 +4153,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 273, + "pointer" : 274, "desugared_type" : 12 } )>, <"LValueReferenceType" : ( { - "pointer" : 274 + "pointer" : 275 }, { "type_ptr" : 12, @@ -4165,13 +4171,13 @@ "pointer" : 20 }, { - "type_ptr" : 273, + "type_ptr" : 274, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 275 + "pointer" : 276 }, { "return_type" : { @@ -4181,7 +4187,7 @@ { "params_type" : [ { - "type_ptr" : 274 + "type_ptr" : 275 } ] } @@ -4205,7 +4211,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 276 + "pointer" : 277 }, { "type_ptr" : 12 @@ -4216,12 +4222,12 @@ "pointer" : 24 }, { - "type_ptr" : 273 + "type_ptr" : 274 } )>, <"FunctionProtoType" : ( { - "pointer" : 277 + "pointer" : 278 }, { "return_type" : { @@ -4231,7 +4237,7 @@ { "params_type" : [ { - "type_ptr" : 276 + "type_ptr" : 277 } ] } @@ -4267,7 +4273,7 @@ )>, <"PointerType" : ( { - "pointer" : 278 + "pointer" : 279 }, { "type_ptr" : 12 @@ -4275,7 +4281,7 @@ )>, <"PointerType" : ( { - "pointer" : 279 + "pointer" : 280 }, { "type_ptr" : 26 @@ -4283,7 +4289,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 280 + "pointer" : 281 }, { "type_ptr" : 12 @@ -4291,44 +4297,44 @@ )>, <"DecltypeType" : ( { - "pointer" : 281, - "desugared_type" : 250 + "pointer" : 282, + "desugared_type" : 251 }, { - "type_ptr" : 250 + "type_ptr" : 251 } )>, <"TypedefType" : ( { "pointer" : 29, - "desugared_type" : 250 + "desugared_type" : 251 }, { "child_type" : { - "type_ptr" : 281 + "type_ptr" : 282 }, "decl_ptr" : 28 } )>, <"ElaboratedType" : ( { - "pointer" : 282, - "desugared_type" : 250 + "pointer" : 283, + "desugared_type" : 251 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 283 + "pointer" : 284 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 284 + "pointer" : 285 } )>, <"InjectedClassNameType" : ( { - "pointer" : 285 + "pointer" : 286 } )>, <"RecordType" : ( @@ -4339,7 +4345,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 286, + "pointer" : 287, "desugared_type" : 32 } )>, @@ -4351,7 +4357,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 287 + "pointer" : 288 }, { "return_type" : { @@ -4363,13 +4369,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 288, + "pointer" : 289, "desugared_type" : 32 } )>, <"LValueReferenceType" : ( { - "pointer" : 289 + "pointer" : 290 }, { "type_ptr" : 32, @@ -4381,13 +4387,13 @@ "pointer" : 39 }, { - "type_ptr" : 288, + "type_ptr" : 289, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 290 + "pointer" : 291 }, { "return_type" : { @@ -4397,7 +4403,7 @@ { "params_type" : [ { - "type_ptr" : 289 + "type_ptr" : 290 } ] } @@ -4421,7 +4427,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 291 + "pointer" : 292 }, { "type_ptr" : 32 @@ -4432,12 +4438,12 @@ "pointer" : 43 }, { - "type_ptr" : 288 + "type_ptr" : 289 } )>, <"FunctionProtoType" : ( { - "pointer" : 292 + "pointer" : 293 }, { "return_type" : { @@ -4447,7 +4453,7 @@ { "params_type" : [ { - "type_ptr" : 291 + "type_ptr" : 292 } ] } @@ -4471,7 +4477,7 @@ )>, <"PointerType" : ( { - "pointer" : 293 + "pointer" : 294 }, { "type_ptr" : 32 @@ -4479,7 +4485,7 @@ )>, <"PointerType" : ( { - "pointer" : 294 + "pointer" : 295 }, { "type_ptr" : 45 @@ -4487,7 +4493,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 295 + "pointer" : 296 }, { "type_ptr" : 32 @@ -4495,47 +4501,47 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 296 + "pointer" : 297 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 297 + "pointer" : 298 } )>, <"InjectedClassNameType" : ( { - "pointer" : 298 + "pointer" : 299 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 299 + "pointer" : 300 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 300 + "pointer" : 301 } )>, <"InjectedClassNameType" : ( { - "pointer" : 301 + "pointer" : 302 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 302 + "pointer" : 303 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 303 + "pointer" : 304 } )>, <"InjectedClassNameType" : ( { - "pointer" : 304 + "pointer" : 305 } )>, <"RecordType" : ( @@ -4546,7 +4552,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 305, + "pointer" : 306, "desugared_type" : 49 } )>, @@ -4558,7 +4564,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 306 + "pointer" : 307 }, { "return_type" : { @@ -4570,13 +4576,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 307, + "pointer" : 308, "desugared_type" : 49 } )>, <"LValueReferenceType" : ( { - "pointer" : 308 + "pointer" : 309 }, { "type_ptr" : 49, @@ -4588,13 +4594,13 @@ "pointer" : 56 }, { - "type_ptr" : 307, + "type_ptr" : 308, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 309 + "pointer" : 310 }, { "return_type" : { @@ -4604,7 +4610,7 @@ { "params_type" : [ { - "type_ptr" : 308 + "type_ptr" : 309 } ] } @@ -4628,7 +4634,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 310 + "pointer" : 311 }, { "type_ptr" : 49 @@ -4639,12 +4645,12 @@ "pointer" : 60 }, { - "type_ptr" : 307 + "type_ptr" : 308 } )>, <"FunctionProtoType" : ( { - "pointer" : 311 + "pointer" : 312 }, { "return_type" : { @@ -4654,7 +4660,7 @@ { "params_type" : [ { - "type_ptr" : 310 + "type_ptr" : 311 } ] } @@ -4678,7 +4684,7 @@ )>, <"PointerType" : ( { - "pointer" : 312 + "pointer" : 313 }, { "type_ptr" : 49 @@ -4686,7 +4692,7 @@ )>, <"PointerType" : ( { - "pointer" : 313 + "pointer" : 314 }, { "type_ptr" : 90 @@ -4694,7 +4700,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 314 + "pointer" : 315 }, { "type_ptr" : 49 @@ -4708,7 +4714,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 315, + "pointer" : 316, "desugared_type" : 63 } )>, @@ -4720,7 +4726,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 316 + "pointer" : 317 }, { "return_type" : { @@ -4732,13 +4738,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 317, + "pointer" : 318, "desugared_type" : 63 } )>, <"LValueReferenceType" : ( { - "pointer" : 318 + "pointer" : 319 }, { "type_ptr" : 63, @@ -4750,13 +4756,13 @@ "pointer" : 70 }, { - "type_ptr" : 317, + "type_ptr" : 318, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 319 + "pointer" : 320 }, { "return_type" : { @@ -4766,7 +4772,7 @@ { "params_type" : [ { - "type_ptr" : 318 + "type_ptr" : 319 } ] } @@ -4790,7 +4796,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 320 + "pointer" : 321 }, { "type_ptr" : 63 @@ -4801,12 +4807,12 @@ "pointer" : 74 }, { - "type_ptr" : 317 + "type_ptr" : 318 } )>, <"FunctionProtoType" : ( { - "pointer" : 321 + "pointer" : 322 }, { "return_type" : { @@ -4816,7 +4822,7 @@ { "params_type" : [ { - "type_ptr" : 320 + "type_ptr" : 321 } ] } @@ -4840,7 +4846,7 @@ )>, <"PointerType" : ( { - "pointer" : 322 + "pointer" : 323 }, { "type_ptr" : 63 @@ -4848,7 +4854,7 @@ )>, <"PointerType" : ( { - "pointer" : 323 + "pointer" : 324 }, { "type_ptr" : 93 @@ -4856,7 +4862,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 324 + "pointer" : 325 }, { "type_ptr" : 63 @@ -4870,7 +4876,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 325, + "pointer" : 326, "desugared_type" : 77 } )>, @@ -4882,7 +4888,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 326 + "pointer" : 327 }, { "return_type" : { @@ -4894,13 +4900,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 327, + "pointer" : 328, "desugared_type" : 77 } )>, <"LValueReferenceType" : ( { - "pointer" : 328 + "pointer" : 329 }, { "type_ptr" : 77, @@ -4912,13 +4918,13 @@ "pointer" : 84 }, { - "type_ptr" : 327, + "type_ptr" : 328, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 329 + "pointer" : 330 }, { "return_type" : { @@ -4928,7 +4934,7 @@ { "params_type" : [ { - "type_ptr" : 328 + "type_ptr" : 329 } ] } @@ -4952,7 +4958,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 330 + "pointer" : 331 }, { "type_ptr" : 77 @@ -4963,12 +4969,12 @@ "pointer" : 88 }, { - "type_ptr" : 327 + "type_ptr" : 328 } )>, <"FunctionProtoType" : ( { - "pointer" : 331 + "pointer" : 332 }, { "return_type" : { @@ -4978,7 +4984,7 @@ { "params_type" : [ { - "type_ptr" : 330 + "type_ptr" : 331 } ] } @@ -5002,7 +5008,7 @@ )>, <"PointerType" : ( { - "pointer" : 332 + "pointer" : 333 }, { "type_ptr" : 77 @@ -5010,7 +5016,7 @@ )>, <"PointerType" : ( { - "pointer" : 333 + "pointer" : 334 }, { "type_ptr" : 96 @@ -5018,7 +5024,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 334 + "pointer" : 335 }, { "type_ptr" : 77 @@ -5026,17 +5032,17 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 335 + "pointer" : 336 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 336 + "pointer" : 337 } )>, <"InjectedClassNameType" : ( { - "pointer" : 337 + "pointer" : 338 } )>, <"ConstantArrayType" : ( @@ -5065,7 +5071,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 338 + "pointer" : 339 }, { "type_ptr" : 115, @@ -5083,22 +5089,22 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 339 + "pointer" : 340 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 340 + "pointer" : 341 } )>, <"InjectedClassNameType" : ( { - "pointer" : 341 + "pointer" : 342 } )>, <"FunctionProtoType" : ( { - "pointer" : 342 + "pointer" : 343 }, { "return_type" : { @@ -5110,7 +5116,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 343 + "pointer" : 344 }, { "return_type" : { @@ -5120,7 +5126,7 @@ { "params_type" : [ { - "type_ptr" : 338 + "type_ptr" : 339 } ] } @@ -5144,7 +5150,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 344 + "pointer" : 345 }, { "type_ptr" : 115 @@ -5160,7 +5166,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 345 + "pointer" : 346 }, { "return_type" : { @@ -5170,7 +5176,7 @@ { "params_type" : [ { - "type_ptr" : 344 + "type_ptr" : 345 } ] } @@ -5194,7 +5200,7 @@ )>, <"PointerType" : ( { - "pointer" : 346 + "pointer" : 347 }, { "type_ptr" : 115 @@ -5202,7 +5208,7 @@ )>, <"PointerType" : ( { - "pointer" : 347 + "pointer" : 348 }, { "type_ptr" : 142 @@ -5210,7 +5216,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 348 + "pointer" : 349 }, { "type_ptr" : 115 @@ -5230,7 +5236,7 @@ )>, <"ParenType" : ( { - "pointer" : 349, + "pointer" : 350, "desugared_type" : 159 }, { @@ -5239,7 +5245,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 350 + "pointer" : 351 }, { "type_ptr" : 159 @@ -5247,25 +5253,25 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 351 + "pointer" : 352 }, { - "type_ptr" : 349 + "type_ptr" : 350 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 352 + "pointer" : 353 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 353 + "pointer" : 354 } )>, <"InjectedClassNameType" : ( { - "pointer" : 354 + "pointer" : 355 } )>, <"FunctionProtoType" : ( @@ -5287,7 +5293,7 @@ )>, <"ParenType" : ( { - "pointer" : 355, + "pointer" : 356, "desugared_type" : 161 }, { @@ -5296,7 +5302,7 @@ )>, <"PointerType" : ( { - "pointer" : 356 + "pointer" : 357 }, { "type_ptr" : 161 @@ -5304,30 +5310,30 @@ )>, <"PointerType" : ( { - "pointer" : 357 + "pointer" : 358 }, { - "type_ptr" : 355 + "type_ptr" : 356 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 358 + "pointer" : 359 } )>, <"TemplateSpecializationType" : ( { - "pointer" : 359 + "pointer" : 360 } )>, <"InjectedClassNameType" : ( { - "pointer" : 360 + "pointer" : 361 } )>, <"PointerType" : ( { - "pointer" : 361 + "pointer" : 362 }, { "type_ptr" : 10 @@ -5341,7 +5347,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 362, + "pointer" : 363, "desugared_type" : 100 } )>, @@ -5353,7 +5359,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 363 + "pointer" : 364 }, { "return_type" : { @@ -5365,13 +5371,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 364, + "pointer" : 365, "desugared_type" : 100 } )>, <"LValueReferenceType" : ( { - "pointer" : 365 + "pointer" : 366 }, { "type_ptr" : 100, @@ -5383,13 +5389,13 @@ "pointer" : 107 }, { - "type_ptr" : 364, + "type_ptr" : 365, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 366 + "pointer" : 367 }, { "return_type" : { @@ -5399,7 +5405,7 @@ { "params_type" : [ { - "type_ptr" : 365 + "type_ptr" : 366 } ] } @@ -5423,7 +5429,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 367 + "pointer" : 368 }, { "type_ptr" : 100 @@ -5434,12 +5440,12 @@ "pointer" : 111 }, { - "type_ptr" : 364 + "type_ptr" : 365 } )>, <"FunctionProtoType" : ( { - "pointer" : 368 + "pointer" : 369 }, { "return_type" : { @@ -5449,7 +5455,7 @@ { "params_type" : [ { - "type_ptr" : 367 + "type_ptr" : 368 } ] } @@ -5473,7 +5479,7 @@ )>, <"PointerType" : ( { - "pointer" : 369 + "pointer" : 370 }, { "type_ptr" : 100 @@ -5481,7 +5487,7 @@ )>, <"PointerType" : ( { - "pointer" : 370 + "pointer" : 371 }, { "type_ptr" : 178 @@ -5489,7 +5495,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 371 + "pointer" : 372 }, { "type_ptr" : 100 @@ -5503,7 +5509,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 372, + "pointer" : 373, "desugared_type" : 129 } )>, @@ -5515,7 +5521,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 373 + "pointer" : 374 }, { "return_type" : { @@ -5527,13 +5533,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 374, + "pointer" : 375, "desugared_type" : 129 } )>, <"LValueReferenceType" : ( { - "pointer" : 375 + "pointer" : 376 }, { "type_ptr" : 129, @@ -5545,13 +5551,13 @@ "pointer" : 136 }, { - "type_ptr" : 374, + "type_ptr" : 375, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 376 + "pointer" : 377 }, { "return_type" : { @@ -5561,7 +5567,7 @@ { "params_type" : [ { - "type_ptr" : 375 + "type_ptr" : 376 } ] } @@ -5585,7 +5591,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 377 + "pointer" : 378 }, { "type_ptr" : 129 @@ -5596,12 +5602,12 @@ "pointer" : 140 }, { - "type_ptr" : 374 + "type_ptr" : 375 } )>, <"FunctionProtoType" : ( { - "pointer" : 378 + "pointer" : 379 }, { "return_type" : { @@ -5611,7 +5617,7 @@ { "params_type" : [ { - "type_ptr" : 377 + "type_ptr" : 378 } ] } @@ -5635,7 +5641,7 @@ )>, <"PointerType" : ( { - "pointer" : 379 + "pointer" : 380 }, { "type_ptr" : 129 @@ -5643,7 +5649,7 @@ )>, <"PointerType" : ( { - "pointer" : 380 + "pointer" : 381 }, { "type_ptr" : 181 @@ -5651,7 +5657,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 381 + "pointer" : 382 }, { "type_ptr" : 129 @@ -5665,7 +5671,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 382, + "pointer" : 383, "desugared_type" : 146 } )>, @@ -5677,7 +5683,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 383 + "pointer" : 384 }, { "return_type" : { @@ -5689,13 +5695,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 384, + "pointer" : 385, "desugared_type" : 146 } )>, <"LValueReferenceType" : ( { - "pointer" : 385 + "pointer" : 386 }, { "type_ptr" : 146, @@ -5707,13 +5713,13 @@ "pointer" : 153 }, { - "type_ptr" : 384, + "type_ptr" : 385, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 386 + "pointer" : 387 }, { "return_type" : { @@ -5723,7 +5729,7 @@ { "params_type" : [ { - "type_ptr" : 385 + "type_ptr" : 386 } ] } @@ -5747,7 +5753,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 387 + "pointer" : 388 }, { "type_ptr" : 146 @@ -5758,12 +5764,12 @@ "pointer" : 157 }, { - "type_ptr" : 384 + "type_ptr" : 385 } )>, <"FunctionProtoType" : ( { - "pointer" : 388 + "pointer" : 389 }, { "return_type" : { @@ -5773,7 +5779,7 @@ { "params_type" : [ { - "type_ptr" : 387 + "type_ptr" : 388 } ] } @@ -5797,7 +5803,7 @@ )>, <"PointerType" : ( { - "pointer" : 389 + "pointer" : 390 }, { "type_ptr" : 146 @@ -5805,7 +5811,7 @@ )>, <"PointerType" : ( { - "pointer" : 390 + "pointer" : 391 }, { "type_ptr" : 184 @@ -5813,7 +5819,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 391 + "pointer" : 392 }, { "type_ptr" : 146 @@ -5821,7 +5827,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 392 + "pointer" : 393 }, { "type_ptr" : 161 @@ -5835,7 +5841,7 @@ )>, <"TemplateSpecializationType" : ( { - "pointer" : 393, + "pointer" : 394, "desugared_type" : 165 } )>, @@ -5847,7 +5853,7 @@ )>, <"FunctionProtoType" : ( { - "pointer" : 394 + "pointer" : 395 }, { "return_type" : { @@ -5859,13 +5865,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 395, + "pointer" : 396, "desugared_type" : 165 } )>, <"LValueReferenceType" : ( { - "pointer" : 396 + "pointer" : 397 }, { "type_ptr" : 165, @@ -5877,13 +5883,13 @@ "pointer" : 172 }, { - "type_ptr" : 395, + "type_ptr" : 396, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 397 + "pointer" : 398 }, { "return_type" : { @@ -5893,7 +5899,7 @@ { "params_type" : [ { - "type_ptr" : 396 + "type_ptr" : 397 } ] } @@ -5917,7 +5923,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 398 + "pointer" : 399 }, { "type_ptr" : 165 @@ -5928,12 +5934,12 @@ "pointer" : 176 }, { - "type_ptr" : 395 + "type_ptr" : 396 } )>, <"FunctionProtoType" : ( { - "pointer" : 399 + "pointer" : 400 }, { "return_type" : { @@ -5943,7 +5949,7 @@ { "params_type" : [ { - "type_ptr" : 398 + "type_ptr" : 399 } ] } @@ -5967,7 +5973,7 @@ )>, <"PointerType" : ( { - "pointer" : 400 + "pointer" : 401 }, { "type_ptr" : 165 @@ -5975,7 +5981,7 @@ )>, <"PointerType" : ( { - "pointer" : 401 + "pointer" : 402 }, { "type_ptr" : 187 @@ -5983,7 +5989,7 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 402 + "pointer" : 403 }, { "type_ptr" : 165 @@ -5991,60 +5997,60 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 403 + "pointer" : 404 }, { - "base_type" : 246 + "base_type" : 247 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 404 + "pointer" : 405 }, { - "type_ptr" : 403 + "type_ptr" : 404 } )>, <"TypedefType" : ( { - "pointer" : 405, - "desugared_type" : 404 + "pointer" : 406, + "desugared_type" : 405 }, { "child_type" : { - "type_ptr" : 404 + "type_ptr" : 405 }, - "decl_ptr" : 406 + "decl_ptr" : 407 } )>, <"TypedefType" : ( { "pointer" : 190, - "desugared_type" : 404 + "desugared_type" : 405 }, { "child_type" : { - "type_ptr" : 405 + "type_ptr" : 406 }, "decl_ptr" : 189 } )>, <"DecayedType" : ( { - "pointer" : 407, - "desugared_type" : 361 + "pointer" : 408, + "desugared_type" : 362 }, { - "type_ptr" : 361 + "type_ptr" : 362 } )>, <"DecayedType" : ( { - "pointer" : 408, - "desugared_type" : 361 + "pointer" : 409, + "desugared_type" : 362 }, { - "type_ptr" : 361 + "type_ptr" : 362 } )>, <"NoneType" : ( diff --git a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/this.cpp.exp b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/this.cpp.exp index d79fcfe27db..f1762067628 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/this.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/this.cpp.exp @@ -726,47 +726,53 @@ { "pointer" : 73 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 74 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 75 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 76 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 77 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 78 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 79 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 80 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 80 + "pointer" : 81 }, { "type_ptr" : 22 @@ -774,31 +780,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 81 + "pointer" : 82 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 82 + "pointer" : 83 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 83 + "pointer" : 84 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 84 + "pointer" : 85 }, - 85 + 86 )>, <"PointerType" : ( { - "pointer" : 86 + "pointer" : 87 }, { "type_ptr" : 11, @@ -807,7 +813,7 @@ )>, <"PointerType" : ( { - "pointer" : 87 + "pointer" : 88 }, { "type_ptr" : 24, @@ -816,7 +822,7 @@ )>, <"PointerType" : ( { - "pointer" : 88 + "pointer" : 89 }, { "type_ptr" : 24 @@ -824,17 +830,17 @@ )>, <"RecordType" : ( { - "pointer" : 89 + "pointer" : 90 }, - 90 + 91 )>, <"ConstantArrayType" : ( { - "pointer" : 91 + "pointer" : 92 }, { "element_type" : { - "type_ptr" : 89 + "type_ptr" : 90 }, "stride" : 24 }, @@ -868,40 +874,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 92 + "pointer" : 93 }, { - "base_type" : 77 + "base_type" : 78 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 93 + "pointer" : 94 }, { - "type_ptr" : 92 + "type_ptr" : 93 } )>, <"TypedefType" : ( { - "pointer" : 94, - "desugared_type" : 93 + "pointer" : 95, + "desugared_type" : 94 }, { "child_type" : { - "type_ptr" : 93 + "type_ptr" : 94 }, - "decl_ptr" : 95 + "decl_ptr" : 96 } )>, <"TypedefType" : ( { "pointer" : 21, - "desugared_type" : 93 + "desugared_type" : 94 }, { "child_type" : { - "type_ptr" : 94 + "type_ptr" : 95 }, "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 5951a08f5ee..40a8167031b 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/type_trait.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/type_trait.cpp.exp @@ -1187,47 +1187,53 @@ { "pointer" : 96 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 97 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 98 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 99 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 100 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 101 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 102 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 103 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 103 + "pointer" : 104 }, { "type_ptr" : 46 @@ -1235,31 +1241,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 104 + "pointer" : 105 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 105 + "pointer" : 106 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 106 + "pointer" : 107 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 107 + "pointer" : 108 }, - 108 + 109 )>, <"PointerType" : ( { - "pointer" : 109 + "pointer" : 110 }, { "type_ptr" : 30, @@ -1268,7 +1274,7 @@ )>, <"PointerType" : ( { - "pointer" : 110 + "pointer" : 111 }, { "type_ptr" : 47, @@ -1277,7 +1283,7 @@ )>, <"PointerType" : ( { - "pointer" : 111 + "pointer" : 112 }, { "type_ptr" : 47 @@ -1285,17 +1291,17 @@ )>, <"RecordType" : ( { - "pointer" : 112 + "pointer" : 113 }, - 113 + 114 )>, <"ConstantArrayType" : ( { - "pointer" : 114 + "pointer" : 115 }, { "element_type" : { - "type_ptr" : 112 + "type_ptr" : 113 }, "stride" : 24 }, @@ -1309,7 +1315,7 @@ )>, <"PointerType" : ( { - "pointer" : 115 + "pointer" : 116 }, { "type_ptr" : 8 @@ -1329,13 +1335,13 @@ )>, <"ElaboratedType" : ( { - "pointer" : 116, + "pointer" : 117, "desugared_type" : 8 } )>, <"LValueReferenceType" : ( { - "pointer" : 117 + "pointer" : 118 }, { "type_ptr" : 8 @@ -1343,15 +1349,15 @@ )>, <"LValueReferenceType" : ( { - "pointer" : 118 + "pointer" : 119 }, { - "type_ptr" : 116 + "type_ptr" : 117 } )>, <"LValueReferenceType" : ( { - "pointer" : 119 + "pointer" : 120 }, { "type_ptr" : 8, @@ -1363,23 +1369,23 @@ "pointer" : 16 }, { - "type_ptr" : 116, + "type_ptr" : 117, "is_const" : true } )>, <"FunctionProtoType" : ( { - "pointer" : 120 + "pointer" : 121 }, { "return_type" : { - "type_ptr" : 117 + "type_ptr" : 118 } }, { "params_type" : [ { - "type_ptr" : 119 + "type_ptr" : 120 } ] } @@ -1390,7 +1396,7 @@ }, { "return_type" : { - "type_ptr" : 118 + "type_ptr" : 119 } }, { @@ -1403,7 +1409,7 @@ )>, <"RValueReferenceType" : ( { - "pointer" : 121 + "pointer" : 122 }, { "type_ptr" : 8 @@ -1414,22 +1420,22 @@ "pointer" : 20 }, { - "type_ptr" : 116 + "type_ptr" : 117 } )>, <"FunctionProtoType" : ( { - "pointer" : 122 + "pointer" : 123 }, { "return_type" : { - "type_ptr" : 117 + "type_ptr" : 118 } }, { "params_type" : [ { - "type_ptr" : 121 + "type_ptr" : 122 } ] } @@ -1440,7 +1446,7 @@ }, { "return_type" : { - "type_ptr" : 118 + "type_ptr" : 119 } }, { @@ -1465,12 +1471,12 @@ )>, <"TemplateTypeParmType" : ( { - "pointer" : 123 + "pointer" : 124 } )>, <"TemplateTypeParmType" : ( { - "pointer" : 124 + "pointer" : 125 } )>, <"FunctionProtoType" : ( @@ -1495,52 +1501,52 @@ )>, <"SubstTemplateTypeParmType" : ( { - "pointer" : 125, + "pointer" : 126, "desugared_type" : 30 } )>, <"SubstTemplateTypeParmType" : ( { - "pointer" : 126, + "pointer" : 127, "desugared_type" : 8 } )>, <"ObjCObjectType" : ( { - "pointer" : 127 + "pointer" : 128 }, { - "base_type" : 100 + "base_type" : 101 } )>, <"ObjCObjectPointerType" : ( { - "pointer" : 128 + "pointer" : 129 }, { - "type_ptr" : 127 + "type_ptr" : 128 } )>, <"TypedefType" : ( { - "pointer" : 129, - "desugared_type" : 128 + "pointer" : 130, + "desugared_type" : 129 }, { "child_type" : { - "type_ptr" : 128 + "type_ptr" : 129 }, - "decl_ptr" : 130 + "decl_ptr" : 131 } )>, <"TypedefType" : ( { "pointer" : 45, - "desugared_type" : 128 + "desugared_type" : 129 }, { "child_type" : { - "type_ptr" : 129 + "type_ptr" : 130 }, "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 3838e7dc150..4a1424cf4a6 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/unresolved_lookup.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/unresolved_lookup.cpp.exp @@ -489,47 +489,53 @@ { "pointer" : 62 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 63 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 64 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 65 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 66 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 67 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 68 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 69 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 69 + "pointer" : 70 }, { "type_ptr" : 10 @@ -537,31 +543,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 70 + "pointer" : 71 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 71 + "pointer" : 72 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 72 + "pointer" : 73 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 73 + "pointer" : 74 }, - 74 + 75 )>, <"PointerType" : ( { - "pointer" : 75 + "pointer" : 76 }, { "type_ptr" : 15, @@ -570,7 +576,7 @@ )>, <"PointerType" : ( { - "pointer" : 76 + "pointer" : 77 }, { "type_ptr" : 12, @@ -579,7 +585,7 @@ )>, <"PointerType" : ( { - "pointer" : 77 + "pointer" : 78 }, { "type_ptr" : 12 @@ -587,33 +593,28 @@ )>, <"RecordType" : ( { - "pointer" : 78 + "pointer" : 79 }, - 79 + 80 )>, <"ConstantArrayType" : ( { - "pointer" : 80 + "pointer" : 81 }, { "element_type" : { - "type_ptr" : 78 + "type_ptr" : 79 }, "stride" : 24 }, 1 )>, - <"TemplateTypeParmType" : ( - { - "pointer" : 81 - } - )>, <"TemplateTypeParmType" : ( { "pointer" : 82 } )>, - <"TemplateSpecializationType" : ( + <"TemplateTypeParmType" : ( { "pointer" : 83 } @@ -623,12 +624,12 @@ "pointer" : 84 } )>, - <"InjectedClassNameType" : ( + <"TemplateSpecializationType" : ( { "pointer" : 85 } )>, - <"TemplateTypeParmType" : ( + <"InjectedClassNameType" : ( { "pointer" : 86 } @@ -638,12 +639,9 @@ "pointer" : 87 } )>, - <"PointerType" : ( + <"TemplateTypeParmType" : ( { "pointer" : 88 - }, - { - "type_ptr" : 86 } )>, <"PointerType" : ( @@ -659,13 +657,21 @@ "pointer" : 90 }, { - "type_ptr" : 85 + "type_ptr" : 88 } )>, - <"FunctionProtoType" : ( + <"PointerType" : ( { "pointer" : 91 }, + { + "type_ptr" : 86 + } + )>, + <"FunctionProtoType" : ( + { + "pointer" : 92 + }, { "return_type" : { "type_ptr" : 15 @@ -674,14 +680,14 @@ { "params_type" : [ { - "type_ptr" : 88 + "type_ptr" : 89 } ] } )>, <"FunctionProtoType" : ( { - "pointer" : 92 + "pointer" : 93 }, { "return_type" : { @@ -691,53 +697,53 @@ { "params_type" : [ { - "type_ptr" : 89 + "type_ptr" : 90 } ] } )>, <"TemplateSpecializationType" : ( { - "pointer" : 93, - "desugared_type" : 85 + "pointer" : 94, + "desugared_type" : 86 } )>, <"ObjCObjectType" : ( { - "pointer" : 94 + "pointer" : 95 }, { - "base_type" : 66 + "base_type" : 67 } )>, <"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" : 9, - "desugared_type" : 95 + "desugared_type" : 96 }, { "child_type" : { - "type_ptr" : 96 + "type_ptr" : 97 }, "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 b71ece15340..a8da8015c11 100644 --- a/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/using_directive.cpp.exp +++ b/facebook-clang-plugins/libtooling/tests/YojsonASTExporter/using_directive.cpp.exp @@ -745,47 +745,53 @@ { "pointer" : 69 }, - <"PseudoObject"> + <"UnresolvedTemplate"> )>, <"BuiltinType" : ( { "pointer" : 70 }, - <"UnknownAny"> + <"PseudoObject"> )>, <"BuiltinType" : ( { "pointer" : 71 }, - <"ARCUnbridgedCast"> + <"UnknownAny"> )>, <"BuiltinType" : ( { "pointer" : 72 }, - <"BuiltinFn"> + <"ARCUnbridgedCast"> )>, <"BuiltinType" : ( { "pointer" : 73 }, - <"ObjCId"> + <"BuiltinFn"> )>, <"BuiltinType" : ( { "pointer" : 74 }, - <"ObjCClass"> + <"ObjCId"> )>, <"BuiltinType" : ( { "pointer" : 75 }, + <"ObjCClass"> + )>, + <"BuiltinType" : ( + { + "pointer" : 76 + }, <"ObjCSel"> )>, <"PointerType" : ( { - "pointer" : 76 + "pointer" : 77 }, { "type_ptr" : 18 @@ -793,31 +799,31 @@ )>, <"BuiltinType" : ( { - "pointer" : 77 + "pointer" : 78 }, <"NullPtr"> )>, <"BuiltinType" : ( { - "pointer" : 78 + "pointer" : 79 }, <"Half"> )>, <"BuiltinType" : ( { - "pointer" : 79 + "pointer" : 80 }, <"BFloat16"> )>, <"RecordType" : ( { - "pointer" : 80 + "pointer" : 81 }, - 81 + 82 )>, <"PointerType" : ( { - "pointer" : 82 + "pointer" : 83 }, { "type_ptr" : 10, @@ -826,7 +832,7 @@ )>, <"PointerType" : ( { - "pointer" : 83 + "pointer" : 84 }, { "type_ptr" : 20, @@ -835,7 +841,7 @@ )>, <"PointerType" : ( { - "pointer" : 84 + "pointer" : 85 }, { "type_ptr" : 20 @@ -843,17 +849,17 @@ )>, <"RecordType" : ( { - "pointer" : 85 + "pointer" : 86 }, - 86 + 87 )>, <"ConstantArrayType" : ( { - "pointer" : 87 + "pointer" : 88 }, { "element_type" : { - "type_ptr" : 85 + "type_ptr" : 86 }, "stride" : 24 }, @@ -861,40 +867,40 @@ )>, <"ObjCObjectType" : ( { - "pointer" : 88 + "pointer" : 89 }, { - "base_type" : 73 + "base_type" : 74 } )>, <"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" : 17, - "desugared_type" : 89 + "desugared_type" : 90 }, { "child_type" : { - "type_ptr" : 90 + "type_ptr" : 91 }, "decl_ptr" : 16 } diff --git a/infer/models/objc/src/NSArray.m b/infer/models/objc/src/NSArray.m index 47a1ef44ac4..9ed3591a63a 100644 --- a/infer/models/objc/src/NSArray.m +++ b/infer/models/objc/src/NSArray.m @@ -16,7 +16,7 @@ @implementation NSArray { } - (NSArray*)arrayByAddingObject:(id)anObject { - id a = ((NSObject*)anObject)->isa; + id a = object_getClass(anObject); return [NSArray alloc]; } @@ -25,7 +25,7 @@ + (instancetype)array { } + (instancetype)arrayWithObject:(id)anObject { - id a = ((NSObject*)anObject)->isa; + id a = object_getClass(anObject); return [NSArray alloc]; } diff --git a/infer/models/objc/src/NSDictionary.m b/infer/models/objc/src/NSDictionary.m index 829d1c568df..7958906a0bb 100644 --- a/infer/models/objc/src/NSDictionary.m +++ b/infer/models/objc/src/NSDictionary.m @@ -30,8 +30,8 @@ + (instancetype)dictionary { } + (instancetype)dictionaryWithObject:(id)object forKey:(id)key { - id a = ((NSObject*)object)->isa; - id b = ((NSObject*)key)->isa; + id a = object_getClass(object); + id b = object_getClass(key); return [NSDictionary alloc]; } diff --git a/infer/models/objc/src/NSMutableArray.m b/infer/models/objc/src/NSMutableArray.m index cf228e9d702..4256e279707 100644 --- a/infer/models/objc/src/NSMutableArray.m +++ b/infer/models/objc/src/NSMutableArray.m @@ -14,29 +14,29 @@ @implementation NSMutableArray - (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject { - id a = ((NSObject*)anObject)->isa; + id a = object_getClass(anObject); } - (void)removeObjectsAtIndexes:(NSIndexSet*)indexes { - id a = ((NSObject*)indexes)->isa; + id a = object_getClass(indexes); } - (void)replaceObjectsAtIndexes:(NSIndexSet*)indexes withObjects:(NSArray*)objects { - id a = ((NSObject*)indexes)->isa; - id b = ((NSObject*)objects)->isa; + id a = object_getClass(indexes); + id b = object_getClass(objects); } - (void)setObject:(id)anObject atIndexedSubscript:(NSUInteger)index { - id a = ((NSObject*)anObject)->isa; + id a = object_getClass(anObject); } - (void)addObject:(id)anObject { - id a = ((NSObject*)anObject)->isa; + id a = object_getClass(anObject); } - (void)insertObject:(id)anObject atIndex:(NSUInteger)index { - id a = ((NSObject*)anObject)->isa; + id a = object_getClass(anObject); } + (instancetype)array { diff --git a/infer/models/objc/src/NSMutableDictionary.m b/infer/models/objc/src/NSMutableDictionary.m index f0f325381c7..0bd07b6b0a5 100644 --- a/infer/models/objc/src/NSMutableDictionary.m +++ b/infer/models/objc/src/NSMutableDictionary.m @@ -14,16 +14,16 @@ @implementation NSMutableDictionary - (void)removeObjectForKey:(id)aKey { - id a = ((NSObject*)aKey)->isa; + id a = object_getClass(aKey); } - (void)setObject:(id)object forKeyedSubscript:(id)aKey { - id a = ((NSObject*)aKey)->isa; + id a = object_getClass(aKey); } - (void)setObject:(id)anObject forKey:(id)aKey { - id a = ((NSObject*)anObject)->isa; - id b = ((NSObject*)aKey)->isa; + id a = object_getClass(anObject); + id b = object_getClass(aKey); } + (instancetype)dictionary { @@ -31,7 +31,7 @@ + (instancetype)dictionary { } + (NSMutableDictionary*)dictionaryWithSharedKeySet:(id)keyset { - id a = ((NSObject*)keyset)->isa; + id a = object_getClass(keyset); } @end diff --git a/infer/src/clang/cTrans.ml b/infer/src/clang/cTrans.ml index 4e9c65563f8..75ff2c9c3cf 100644 --- a/infer/src/clang/cTrans.ml +++ b/infer/src/clang/cTrans.ml @@ -5208,6 +5208,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s | CoyieldExpr (stmt_info, operand :: _, expr_info) -> coroutineSuspendExpr_trans trans_state stmt_info expr_info operand | AddrLabelExpr _ + | ArraySectionExpr _ | ArrayTypeTraitExpr _ | AsTypeExpr _ | CapturedStmt _ @@ -5226,6 +5227,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s | DependentScopeDeclRefExpr _ | DesignatedInitExpr _ | DesignatedInitUpdateExpr _ + | EmbedExpr _ | ExpressionTraitExpr _ | ExtVectorElementExpr _ | FunctionParmPackExpr _ @@ -5239,7 +5241,6 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s | NoInitExpr _ | ObjCIsaExpr _ | ObjCSubscriptRefExpr _ - | OMPArraySectionExpr _ | OMPArrayShapingExpr _ | OMPAtomicDirective _ | OMPBarrierDirective _ @@ -5258,6 +5259,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s | OMPForDirective _ | OMPForSimdDirective _ | OMPGenericLoopDirective _ + | OMPInterchangeDirective _ | OMPInteropDirective _ | OMPIteratorExpr _ | OMPMaskedDirective _ @@ -5279,6 +5281,7 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s | OMPParallelMasterTaskLoopDirective _ | OMPParallelMasterTaskLoopSimdDirective _ | OMPParallelSectionsDirective _ + | OMPReverseDirective _ | OMPScanDirective _ | OMPScopeDirective _ | OMPSectionDirective _ @@ -5315,7 +5318,10 @@ module CTrans_funct (F : CModule_type.CFrontend) : CModule_type.CTranslation = s | OMPTeamsGenericLoopDirective _ | OMPTileDirective _ | OMPUnrollDirective _ + | OpenACCComputeConstruct _ + | OpenACCLoopConstruct _ | PackExpansionExpr _ + | PackIndexingExpr _ | ParenListExpr _ | RecoveryExpr _ | RequiresExpr _ diff --git a/infer/tests/codetoanalyze/cpp/biabduction/issues.exp b/infer/tests/codetoanalyze/cpp/biabduction/issues.exp index a14aa466fe3..929d15ede3b 100644 --- a/infer/tests/codetoanalyze/cpp/biabduction/issues.exp +++ b/infer/tests/codetoanalyze/cpp/biabduction/issues.exp @@ -68,10 +68,10 @@ codetoanalyze/cpp/biabduction/npe/npe_added_to_b1.cpp, npe_added_to_b1::shared_p codetoanalyze/cpp/biabduction/npe/npe_added_to_b1.cpp, npe_added_to_b1::causes_npe_person_bad, 2, NULL_DEREFERENCE, B1, ERROR, [start of procedure npe_added_to_b1::causes_npe_person_bad(),start of procedure Person,return from a call to npe_added_to_b1::Person::Person,start of procedure npe_added_to_b1::deref_person()] codetoanalyze/cpp/biabduction/npe/null_returned_by_method.cpp, testNullDeref, 3, NULL_DEREFERENCE, B2, ERROR, [start of procedure testNullDeref(),Taking true branch,start of procedure getNull,return from a call to XFactory::getNull] codetoanalyze/cpp/biabduction/npe/object_deref.cpp, object_deref::derefNullField, 2, NULL_DEREFERENCE, B1, ERROR, [start of procedure object_deref::derefNullField(),start of procedure object_deref::getNull(),return from a call to object_deref::getNull] -codetoanalyze/cpp/biabduction/npe/skip_function_with_const_formals.cpp, FP_skip_then_split_case_bad, 5, NULL_DEREFERENCE, B5, ERROR, [start of procedure FP_skip_then_split_case_bad(),Skipping std::make_shared(): method has no implementation,Skipping skip_no_const(): method has no implementation,start of procedure test_pointer(),Taking false branch,return from a call to test_pointer] -codetoanalyze/cpp/biabduction/npe/skip_function_with_const_formals.cpp, FP_const_skip_then_split_case_ok, 5, NULL_DEREFERENCE, B5, ERROR, [start of procedure FP_const_skip_then_split_case_ok(),Skipping std::make_shared(): method has no implementation,Skipping skip_const(): method has no implementation,start of procedure test_pointer(),Taking false branch,return from a call to test_pointer] -codetoanalyze/cpp/biabduction/npe/skip_function_with_const_formals.cpp, FP_const_skip2_then_split_case_ok, 4, NULL_DEREFERENCE, B5, ERROR, [start of procedure FP_const_skip2_then_split_case_ok(),Skipping std::make_shared(): method has no implementation,Skipping skip_const2(): method has no implementation,start of procedure test_pointer(),Taking false branch,return from a call to test_pointer] -codetoanalyze/cpp/biabduction/npe/skip_function_with_const_formals.cpp, FP_typedef_skip_then_split_case_ok, 4, NULL_DEREFERENCE, B5, ERROR, [start of procedure FP_typedef_skip_then_split_case_ok(),Skipping std::make_shared(): method has no implementation,Skipping skip_typedef(): method has no implementation,start of procedure test_pointer(),Taking false branch,return from a call to test_pointer] +codetoanalyze/cpp/biabduction/npe/skip_function_with_const_formals.cpp, FP_skip_then_split_case_bad, 5, NULL_DEREFERENCE, B5, ERROR, [start of procedure FP_skip_then_split_case_bad(),Skipping std::make_shared(): method has no implementation,Skipping skip_no_const(): method has no implementation,start of procedure test_pointer(),Taking false branch,return from a call to test_pointer] +codetoanalyze/cpp/biabduction/npe/skip_function_with_const_formals.cpp, FP_const_skip_then_split_case_ok, 5, NULL_DEREFERENCE, B5, ERROR, [start of procedure FP_const_skip_then_split_case_ok(),Skipping std::make_shared(): method has no implementation,Skipping skip_const(): method has no implementation,start of procedure test_pointer(),Taking false branch,return from a call to test_pointer] +codetoanalyze/cpp/biabduction/npe/skip_function_with_const_formals.cpp, FP_const_skip2_then_split_case_ok, 4, NULL_DEREFERENCE, B5, ERROR, [start of procedure FP_const_skip2_then_split_case_ok(),Skipping std::make_shared(): method has no implementation,Skipping skip_const2(): method has no implementation,start of procedure test_pointer(),Taking false branch,return from a call to test_pointer] +codetoanalyze/cpp/biabduction/npe/skip_function_with_const_formals.cpp, FP_typedef_skip_then_split_case_ok, 4, NULL_DEREFERENCE, B5, ERROR, [start of procedure FP_typedef_skip_then_split_case_ok(),Skipping std::make_shared(): method has no implementation,Skipping skip_typedef(): method has no implementation,start of procedure test_pointer(),Taking false branch,return from a call to test_pointer] codetoanalyze/cpp/biabduction/numeric/min_max.cpp, min_int_div0, 0, DIVIDE_BY_ZERO, no_bucket, ERROR, [start of procedure min_int_div0()] codetoanalyze/cpp/biabduction/numeric/min_max.cpp, max_int_div0, 0, DIVIDE_BY_ZERO, no_bucket, ERROR, [start of procedure max_int_div0()] codetoanalyze/cpp/biabduction/numeric/min_max.cpp, min_X_div0, 2, DIVIDE_BY_ZERO, no_bucket, ERROR, [start of procedure min_X_div0(),start of procedure X,return from a call to X::X,start of procedure X,return from a call to X::X] diff --git a/infer/tests/codetoanalyze/cpp/bufferoverrun/issues.exp b/infer/tests/codetoanalyze/cpp/bufferoverrun/issues.exp index 78fbb4777f2..fdad57f785a 100644 --- a/infer/tests/codetoanalyze/cpp/bufferoverrun/issues.exp +++ b/infer/tests/codetoanalyze/cpp/bufferoverrun/issues.exp @@ -73,10 +73,6 @@ codetoanalyze/cpp/bufferoverrun/repro1.cpp, LM::fB_FP, 0, INTEGER_OVERFLOW_ codetoanalyze/cpp/bufferoverrun/repro1.cpp, LM::lI_FP, 2, INTEGER_OVERFLOW_L5, no_bucket, ERROR, [,Call,Parameter `o`,Call,Parameter `k`,Call,Parameter `k`,Assignment,Assignment,Assignment,Assignment,Binary operation: ([-oo, +oo] - 1):signed32] codetoanalyze/cpp/bufferoverrun/repro1.cpp, am_Good_FP, 5, INTEGER_OVERFLOW_L5, no_bucket, ERROR, [Call,Call,Call,Assignment,Assignment,Call,Parameter `t->bI`,Call,Assignment,Call,,Parameter `bi`,Binary operation: ([-oo, +oo] - 1):signed32 by call to `ral_good` ] codetoanalyze/cpp/bufferoverrun/simple_vector.cpp, my_vector_oob_Bad, 2, BUFFER_OVERRUN_L2, no_bucket, ERROR, [Parameter `v->_size`,Call,,Parameter `i`,,Parameter `this->_size`,Array declaration,Assignment,Array access: Offset: v->_size Size: v->_size by call to `int_vector::access_at` ] -codetoanalyze/cpp/bufferoverrun/smart_ptr.cpp, smart_ptr::use_shared_ptr1_Bad, 2, BUFFER_OVERRUN_L1, no_bucket, ERROR, [Assignment,Call,,Parameter `i`,,Array declaration,Array access: Offset: 8 Size: 5 by call to `smart_ptr::my_class::my_class` ] -codetoanalyze/cpp/bufferoverrun/smart_ptr.cpp, smart_ptr::use_shared_ptr2_Bad, 3, BUFFER_OVERRUN_L1, no_bucket, ERROR, [Assignment,Call,,Parameter `j`,,Array declaration,Array access: Offset: 16 Size: 10 by call to `smart_ptr::my_class::my_class` ] -codetoanalyze/cpp/bufferoverrun/smart_ptr.cpp, smart_ptr::shared_ptr_with_std_string_Bad, 3, BUFFER_OVERRUN_L1, no_bucket, ERROR, [Assignment,Call,,Parameter `i`,,Array declaration,Array access: Offset: 8 Size: 5 by call to `smart_ptr::my_class::my_class` ] -codetoanalyze/cpp/bufferoverrun/smart_ptr.cpp, smart_ptr::shared_ptr_with_const_int_Bad, 2, BUFFER_OVERRUN_L1, no_bucket, ERROR, [Assignment,Call,,Parameter `i`,,Array declaration,Array access: Offset: 8 Size: 5 by call to `smart_ptr::my_class::my_class` ] codetoanalyze/cpp/bufferoverrun/smart_ptr.cpp, smart_ptr::call_method_Bad, 3, BUFFER_OVERRUN_L1, no_bucket, ERROR, [Call,Parameter `n`,Assignment,Call,,Parameter `this->i`,,Array declaration,Array access: Offset: 8 Size: 5 by call to `smart_ptr::my_class::array_access` ] codetoanalyze/cpp/bufferoverrun/std_array.cpp, std_array_bo_Bad, 2, BUFFER_OVERRUN_L1, no_bucket, ERROR, [,Array declaration,Array access: Offset: 42 Size: 42] codetoanalyze/cpp/bufferoverrun/std_array.cpp, normal_array_bo, 2, BUFFER_OVERRUN_L1, no_bucket, ERROR, [,Array declaration,Array access: Offset: 42 Size: 42] diff --git a/infer/tests/codetoanalyze/cpp/bufferoverrun/smart_ptr.cpp b/infer/tests/codetoanalyze/cpp/bufferoverrun/smart_ptr.cpp index 492ce619af4..1a01472ba15 100644 --- a/infer/tests/codetoanalyze/cpp/bufferoverrun/smart_ptr.cpp +++ b/infer/tests/codetoanalyze/cpp/bufferoverrun/smart_ptr.cpp @@ -42,7 +42,7 @@ class smart_ptr { std::shared_ptr p = std::make_shared(i); } - void use_shared_ptr1_Bad() { + void use_shared_ptr1_Bad_FN() { int i = 8; std::shared_ptr p = std::make_shared(i); } @@ -53,7 +53,7 @@ class smart_ptr { std::shared_ptr p = std::make_shared(i, j); } - void use_shared_ptr2_Bad() { + void use_shared_ptr2_Bad_FN() { int i = 8; int j = 8; std::shared_ptr p = std::make_shared(i, j); @@ -65,7 +65,7 @@ class smart_ptr { std::shared_ptr p = std::make_shared(str, i); } - void shared_ptr_with_std_string_Bad() { + void shared_ptr_with_std_string_Bad_FN() { std::string str = "abc"; int i = 8; std::shared_ptr p = std::make_shared(str, i); @@ -76,7 +76,7 @@ class smart_ptr { std::shared_ptr p = std::make_shared(i); } - void shared_ptr_with_const_int_Bad() { + void shared_ptr_with_const_int_Bad_FN() { const int i = 8; std::shared_ptr p = std::make_shared(i); } diff --git a/infer/tests/codetoanalyze/cpp/performance-11/cost-issues.exp b/infer/tests/codetoanalyze/cpp/performance-11/cost-issues.exp index 9dd74809f2d..bcb3ed2696a 100644 --- a/infer/tests/codetoanalyze/cpp/performance-11/cost-issues.exp +++ b/infer/tests/codetoanalyze/cpp/performance-11/cost-issues.exp @@ -56,7 +56,7 @@ codetoanalyze/cpp/performance/list.cpp, sort_list_string_no_case_constant, 12, codetoanalyze/cpp/performance/list.cpp, sort_list_string_no_case_nlogn_FN, 12 + 5 ⋅ list2->elements.length.ub + 14 ⋅ (list2->elements.length.ub + 1), OnUIThread:false, [{list2->elements.length.ub + 1},Loop,{list2->elements.length.ub},Loop] codetoanalyze/cpp/performance/loops.cpp, loop_with_complicated_bound_constant_FP, ⊤, OnUIThread:false, [Unbounded loop,Loop] codetoanalyze/cpp/performance/loops.cpp, nested_do_while, 942, OnUIThread:false, [] -codetoanalyze/cpp/performance/loops.cpp, zeropad_linear, 40 + 12 ⋅ s->cpp.vector_elem.length.ub + (s->cpp.vector_elem.length.ub + 1), OnUIThread:false, [{s->cpp.vector_elem.length.ub + 1},Call to std::operator==_>,Loop,{s->cpp.vector_elem.length.ub},Call to std::operator==_>,Loop] +codetoanalyze/cpp/performance/loops.cpp, zeropad_linear_FN, 28, OnUIThread:false, [] codetoanalyze/cpp/performance/map.cpp, copy_assignment_map_linear_FN, 3, OnUIThread:false, [] codetoanalyze/cpp/performance/map.cpp, create_map_from_nlogn_linear_FN, 17, OnUIThread:false, [] codetoanalyze/cpp/performance/map.cpp, emplace_logm, 1 + log(m->elements.length.ub), OnUIThread:false, [{m->elements.length.ub},Modeled call to Container.emplace] @@ -101,7 +101,7 @@ codetoanalyze/cpp/performance/std_array.cpp, loop_over_arr_size_constant, 35, O codetoanalyze/cpp/performance/string_test.cpp, call_google_strlen_linear, 2 + str->strlen.ub, OnUIThread:false, [{str->strlen.ub},Modeled call to google::StrLen] codetoanalyze/cpp/performance/string_test.cpp, call_google_strlen_with_loop_linear, 4 + 3 ⋅ str->strlen.ub + str->strlen.ub + 2 ⋅ (str->strlen.ub + 1), OnUIThread:false, [{str->strlen.ub + 1},Loop,{str->strlen.ub},Modeled call to google::StrLen,{str->strlen.ub},Loop] codetoanalyze/cpp/performance/string_test.cpp, iterate_over_string, 15 + 10 ⋅ str->elements.length.ub + 18 ⋅ (str->elements.length.ub + 1), OnUIThread:false, [{str->elements.length.ub + 1},Loop,{str->elements.length.ub},Loop] -codetoanalyze/cpp/performance/string_test.cpp, string_compare_linear, 43 + 12 ⋅ a->cpp.vector_elem.length.ub + (a->cpp.vector_elem.length.ub + 1), OnUIThread:false, [{a->cpp.vector_elem.length.ub + 1},Call to std::operator!=,Call to std::operator==_>,Loop,{a->cpp.vector_elem.length.ub},Call to std::operator!=,Call to std::operator==_>,Loop] +codetoanalyze/cpp/performance/string_test.cpp, string_compare_linear_FN, 31, OnUIThread:false, [] codetoanalyze/cpp/performance/unordered_map.cpp, add_element_to_map_at_linear_FN, 5, OnUIThread:false, [] codetoanalyze/cpp/performance/unordered_map.cpp, add_element_to_map_insert_linear_FN, 3, OnUIThread:false, [] codetoanalyze/cpp/performance/unordered_map.cpp, add_element_to_map_operator_linear_FN, 5, OnUIThread:false, [] diff --git a/infer/tests/codetoanalyze/cpp/performance/cost-issues.exp b/infer/tests/codetoanalyze/cpp/performance/cost-issues.exp index a49e5c4b3b4..7ea44886695 100644 --- a/infer/tests/codetoanalyze/cpp/performance/cost-issues.exp +++ b/infer/tests/codetoanalyze/cpp/performance/cost-issues.exp @@ -56,7 +56,7 @@ codetoanalyze/cpp/performance/list.cpp, sort_list_string_no_case_constant, 12, codetoanalyze/cpp/performance/list.cpp, sort_list_string_no_case_nlogn_FN, 10 + 5 ⋅ list2->elements.length.ub + 14 ⋅ (list2->elements.length.ub + 1), OnUIThread:false, [{list2->elements.length.ub + 1},Loop,{list2->elements.length.ub},Loop] codetoanalyze/cpp/performance/loops.cpp, loop_with_complicated_bound_constant_FP, ⊤, OnUIThread:false, [Unbounded loop,Loop] codetoanalyze/cpp/performance/loops.cpp, nested_do_while, 942, OnUIThread:false, [] -codetoanalyze/cpp/performance/loops.cpp, zeropad_linear, 40 + 12 ⋅ s->cpp.vector_elem.length.ub + (s->cpp.vector_elem.length.ub + 1), OnUIThread:false, [{s->cpp.vector_elem.length.ub + 1},Call to std::operator==_>,Loop,{s->cpp.vector_elem.length.ub},Call to std::operator==_>,Loop] +codetoanalyze/cpp/performance/loops.cpp, zeropad_linear_FN, 28, OnUIThread:false, [] codetoanalyze/cpp/performance/map.cpp, copy_assignment_map_linear_FN, 3, OnUIThread:false, [] codetoanalyze/cpp/performance/map.cpp, create_map_from_nlogn_linear_FN, 17, OnUIThread:false, [] codetoanalyze/cpp/performance/map.cpp, emplace_logm, 1 + log(m->elements.length.ub), OnUIThread:false, [{m->elements.length.ub},Modeled call to Container.emplace] @@ -101,7 +101,7 @@ codetoanalyze/cpp/performance/std_array.cpp, loop_over_arr_size_constant, 35, O codetoanalyze/cpp/performance/string_test.cpp, call_google_strlen_linear, 2 + str->strlen.ub, OnUIThread:false, [{str->strlen.ub},Modeled call to google::StrLen] codetoanalyze/cpp/performance/string_test.cpp, call_google_strlen_with_loop_linear, 4 + 3 ⋅ str->strlen.ub + str->strlen.ub + 2 ⋅ (str->strlen.ub + 1), OnUIThread:false, [{str->strlen.ub + 1},Loop,{str->strlen.ub},Modeled call to google::StrLen,{str->strlen.ub},Loop] codetoanalyze/cpp/performance/string_test.cpp, iterate_over_string, 7 + 10 ⋅ str->elements.length.ub + 18 ⋅ (str->elements.length.ub + 1), OnUIThread:false, [{str->elements.length.ub + 1},Loop,{str->elements.length.ub},Loop] -codetoanalyze/cpp/performance/string_test.cpp, string_compare_linear, 43 + 12 ⋅ a->cpp.vector_elem.length.ub + (a->cpp.vector_elem.length.ub + 1), OnUIThread:false, [{a->cpp.vector_elem.length.ub + 1},Call to std::operator!=,Call to std::operator==_>,Loop,{a->cpp.vector_elem.length.ub},Call to std::operator!=,Call to std::operator==_>,Loop] +codetoanalyze/cpp/performance/string_test.cpp, string_compare_linear_FN, 31, OnUIThread:false, [] codetoanalyze/cpp/performance/unordered_map.cpp, add_element_to_map_at_linear_FN, 5, OnUIThread:false, [] codetoanalyze/cpp/performance/unordered_map.cpp, add_element_to_map_insert_linear_FN, 3, OnUIThread:false, [] codetoanalyze/cpp/performance/unordered_map.cpp, add_element_to_map_operator_linear_FN, 5, OnUIThread:false, [] diff --git a/infer/tests/codetoanalyze/cpp/performance/loops.cpp b/infer/tests/codetoanalyze/cpp/performance/loops.cpp index 9664a374bbe..9e988b3304c 100644 --- a/infer/tests/codetoanalyze/cpp/performance/loops.cpp +++ b/infer/tests/codetoanalyze/cpp/performance/loops.cpp @@ -21,7 +21,7 @@ void nested_do_while(int p) { } while (a < 20); } -void zeropad_linear(std::string s, std::string p) { +void zeropad_linear_FN(std::string s, std::string p) { while (s == p) { p = p + "0"; } diff --git a/infer/tests/codetoanalyze/cpp/performance/string_test.cpp b/infer/tests/codetoanalyze/cpp/performance/string_test.cpp index 907a2d57f08..121b7be38cf 100644 --- a/infer/tests/codetoanalyze/cpp/performance/string_test.cpp +++ b/infer/tests/codetoanalyze/cpp/performance/string_test.cpp @@ -19,7 +19,7 @@ void call_google_strlen_with_loop_linear(char* str) { } } -int string_compare_linear(const std::string& a, const std::string& b) { +int string_compare_linear_FN(const std::string& a, const std::string& b) { if (a != b) { return 0; } diff --git a/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot b/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot index 0868be037ca..15aac3fa269 100644 --- a/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot +++ b/infer/tests/codetoanalyze/cpp/shared/methods/byvals.cpp.dot @@ -71,36 +71,36 @@ digraph cfg { "dummy_struct#__infer_globals_init.24fe54080733cebf_3" -> "dummy_struct#__infer_globals_init.24fe54080733cebf_2" ; -"forward#std#5509689838025688.8bc72f52349b1e67_1" [label="1: Start std::forward\nFormals: __t:int&\nLocals: \n " color=yellow style=filled] +"forward#std#6843465676152835.401ee813c32237ad_1" [label="1: Start std::forward\nFormals: __t:int&\nLocals: \n " color=yellow style=filled] - "forward#std#5509689838025688.8bc72f52349b1e67_1" -> "forward#std#5509689838025688.8bc72f52349b1e67_3" ; -"forward#std#5509689838025688.8bc72f52349b1e67_2" [label="2: Exit std::forward \n " color=yellow style=filled] + "forward#std#6843465676152835.401ee813c32237ad_1" -> "forward#std#6843465676152835.401ee813c32237ad_3" ; +"forward#std#6843465676152835.401ee813c32237ad_2" [label="2: Exit std::forward \n " color=yellow style=filled] -"forward#std#5509689838025688.8bc72f52349b1e67_3" [label="3: Return Stmt \n n$0=*&__t:int& [line 26, column 29]\n " shape="box"] +"forward#std#6843465676152835.401ee813c32237ad_3" [label="3: Return Stmt \n n$0=*&__t:int& [line 26, column 29]\n " shape="box"] - "forward#std#5509689838025688.8bc72f52349b1e67_3" -> "forward#std#5509689838025688.8bc72f52349b1e67_4" ; -"forward#std#5509689838025688.8bc72f52349b1e67_4" [label="4: Return Stmt \n *&return:int&&=(int&&)n$0 [line 26, column 3]\n " shape="box"] + "forward#std#6843465676152835.401ee813c32237ad_3" -> "forward#std#6843465676152835.401ee813c32237ad_4" ; +"forward#std#6843465676152835.401ee813c32237ad_4" [label="4: Return Stmt \n *&return:int&&=(int&&)n$0 [line 26, column 3]\n " shape="box"] - "forward#std#5509689838025688.8bc72f52349b1e67_4" -> "forward#std#5509689838025688.8bc72f52349b1e67_2" ; -"forward#std#85397462976669.e87a3b0bbb2d65df_1" [label="1: Start std::forward\nFormals: __t:int&\nLocals: \n " color=yellow style=filled] + "forward#std#6843465676152835.401ee813c32237ad_4" -> "forward#std#6843465676152835.401ee813c32237ad_2" ; +"forward#std#12782823763342.1f42ecd19692b3db_1" [label="1: Start std::forward\nFormals: __t:int&\nLocals: \n " color=yellow style=filled] - "forward#std#85397462976669.e87a3b0bbb2d65df_1" -> "forward#std#85397462976669.e87a3b0bbb2d65df_3" ; -"forward#std#85397462976669.e87a3b0bbb2d65df_2" [label="2: Exit std::forward \n " color=yellow style=filled] + "forward#std#12782823763342.1f42ecd19692b3db_1" -> "forward#std#12782823763342.1f42ecd19692b3db_3" ; +"forward#std#12782823763342.1f42ecd19692b3db_2" [label="2: Exit std::forward \n " color=yellow style=filled] -"forward#std#85397462976669.e87a3b0bbb2d65df_3" [label="3: Return Stmt \n n$0=*&__t:int& [line 26, column 29]\n " shape="box"] +"forward#std#12782823763342.1f42ecd19692b3db_3" [label="3: Return Stmt \n n$0=*&__t:int& [line 26, column 29]\n " shape="box"] - "forward#std#85397462976669.e87a3b0bbb2d65df_3" -> "forward#std#85397462976669.e87a3b0bbb2d65df_4" ; -"forward#std#85397462976669.e87a3b0bbb2d65df_4" [label="4: Return Stmt \n *&return:int&=n$0 [line 26, column 3]\n " shape="box"] + "forward#std#12782823763342.1f42ecd19692b3db_3" -> "forward#std#12782823763342.1f42ecd19692b3db_4" ; +"forward#std#12782823763342.1f42ecd19692b3db_4" [label="4: Return Stmt \n *&return:int&=n$0 [line 26, column 3]\n " shape="box"] - "forward#std#85397462976669.e87a3b0bbb2d65df_4" -> "forward#std#85397462976669.e87a3b0bbb2d65df_2" ; + "forward#std#12782823763342.1f42ecd19692b3db_4" -> "forward#std#12782823763342.1f42ecd19692b3db_2" ; "make_id#p.2f2dd9bec9bb8475_1" [label="1: Start pass_by_val::make_id\nFormals: args:int& args:int& args:int&& __return_param:pass_by_val::Id*\nLocals: 0$?%__sil_tmpSIL_materialize_temp__n$1:pass_by_val::Id \n " color=yellow style=filled] diff --git a/infer/tests/codetoanalyze/objc/biabduction/global_const/global_const.m b/infer/tests/codetoanalyze/objc/biabduction/global_const/global_const.m index ceb072fd4ae..b18d6dfd64f 100644 --- a/infer/tests/codetoanalyze/objc/biabduction/global_const/global_const.m +++ b/infer/tests/codetoanalyze/objc/biabduction/global_const/global_const.m @@ -22,7 +22,7 @@ - (void)doSomethingOkWithDict:(NSMutableDictionary*)dict [dict removeObjectForKey:str]; } -- (void)doSomethingBadWithDict:(NSMutableDictionary*)dict +- (void)doSomethingBadWithDict_FN:(NSMutableDictionary*)dict andString:(NSString*)input { NSString* str = [Global stringByAppendingString:input]; [dict removeObjectForKey:str]; diff --git a/infer/tests/codetoanalyze/objc/biabduction/issues.exp-all b/infer/tests/codetoanalyze/objc/biabduction/issues.exp-all index d4747160da6..0546b8bcf0f 100644 --- a/infer/tests/codetoanalyze/objc/biabduction/issues.exp-all +++ b/infer/tests/codetoanalyze/objc/biabduction/issues.exp-all @@ -1,5 +1,3 @@ -codetoanalyze/objc/biabduction/global_const/global_const.m, SimpleRoot.doSomethingOkWithDict:andString:, 3, NULL_DEREFERENCE, B2, ERROR, [start of procedure doSomethingOkWithDict:andString:,Message stringByAppendingString: with receiver nil returns nil.] -codetoanalyze/objc/biabduction/global_const/global_const.m, SimpleRoot.doSomethingBadWithDict:andString:, 3, NULL_DEREFERENCE, B2, ERROR, [start of procedure doSomethingBadWithDict:andString:,Message stringByAppendingString: with receiver nil returns nil.] codetoanalyze/objc/biabduction/npe/null_returned_by_method.m, NullReturnedByMethodA.test1, 1, NULL_DEREFERENCE, B5, ERROR, [start of procedure test1,start of procedure test,return from a call to NullReturnedByMethodA.test] codetoanalyze/objc/biabduction/procdescs/main.c, ProcdescMain, 3, BIABDUCTION_MEMORY_LEAK, no_bucket, ERROR, [start of procedure ProcdescMain(),Skipping plusX:andY:: method has no implementation] codetoanalyze/objc/biabduction/procdescs/main.c, call_nslog, 3, BIABDUCTION_MEMORY_LEAK, no_bucket, ERROR, [start of procedure call_nslog(),Skipping NSLog(): method has no implementation] diff --git a/infer/tests/codetoanalyze/objc/biabduction/issues.exp-arc b/infer/tests/codetoanalyze/objc/biabduction/issues.exp-arc index e0630ecacce..154d1f0c441 100644 --- a/infer/tests/codetoanalyze/objc/biabduction/issues.exp-arc +++ b/infer/tests/codetoanalyze/objc/biabduction/issues.exp-arc @@ -1,8 +1,3 @@ -codetoanalyze/objc/biabduction/npe/UpdateDict.m, update_dict_with_key_null, 10, NULL_DEREFERENCE, B1, ERROR, [start of procedure update_dict_with_key_null(),Skipping dictionaryWithObjectsAndKeys:: method has no implementation] -codetoanalyze/objc/biabduction/npe/UpdateDict.m, update_array_with_null, 5, NULL_DEREFERENCE, B1, ERROR, [start of procedure update_array_with_null()] -codetoanalyze/objc/biabduction/npe/UpdateDict.m, add_nil_to_array, 4, NULL_DEREFERENCE, B1, ERROR, [start of procedure add_nil_to_array()] -codetoanalyze/objc/biabduction/npe/UpdateDict.m, insert_nil_in_array, 4, NULL_DEREFERENCE, B1, ERROR, [start of procedure insert_nil_in_array()] -codetoanalyze/objc/biabduction/npe/UpdateDict.m, add_nil_in_dict, 10, NULL_DEREFERENCE, B1, ERROR, [start of procedure add_nil_in_dict(),Skipping dictionaryWithObjectsAndKeys:: method has no implementation] codetoanalyze/objc/biabduction/npe/UpdateDict.m, nullable_NSDictionary_objectForKey, 4, NULL_DEREFERENCE, B5, ERROR, [start of procedure nullable_NSDictionary_objectForKey(),Taking true branch,Taking true branch] codetoanalyze/objc/biabduction/npe/UpdateDict.m, nullable_NSDictionary_objectForKeyedSubscript, 5, NULL_DEREFERENCE, B5, ERROR, [start of procedure nullable_NSDictionary_objectForKeyedSubscript(),Taking true branch,Taking true branch] codetoanalyze/objc/biabduction/npe/UpdateDict.m, nullable_NSMapTable_objectForKey, 4, NULL_DEREFERENCE, B5, ERROR, [start of procedure nullable_NSMapTable_objectForKey(),Taking true branch,Taking true branch] @@ -10,7 +5,6 @@ codetoanalyze/objc/biabduction/npe/nil_in_array_literal.m, Arr.nilInArrayLiteral codetoanalyze/objc/biabduction/npe/nil_in_array_literal.m, Arr.nilInArrayLiteral1, 4, NULL_DEREFERENCE, B1, ERROR, [start of procedure nilInArrayLiteral1] codetoanalyze/objc/biabduction/npe/nil_in_array_literal.m, Arr.nilInArrayLiteral2, 4, NULL_DEREFERENCE, B1, ERROR, [start of procedure nilInArrayLiteral2] codetoanalyze/objc/biabduction/npe/nil_in_array_literal.m, Arr.nilInArrayLiteral3, 4, NULL_DEREFERENCE, B1, ERROR, [start of procedure nilInArrayLiteral3] -codetoanalyze/objc/biabduction/npe/nil_in_array_literal.m, Arr.nilInArrayWithObject, 4, NULL_DEREFERENCE, B1, ERROR, [start of procedure nilInArrayWithObject] codetoanalyze/objc/biabduction/npe/nil_in_array_literal.m, Arr.insertNilBad, 3, NULL_DEREFERENCE, B1, ERROR, [start of procedure insertNilBad,start of procedure initA,Taking true branch,return from a call to A.initA] codetoanalyze/objc/biabduction/npe/nil_in_dictionary_literal.m, ADict.nilInDictionaryLiteralKey0, 4, NULL_DEREFERENCE, B1, ERROR, [start of procedure nilInDictionaryLiteralKey0] codetoanalyze/objc/biabduction/npe/nil_in_dictionary_literal.m, ADict.nilInDictionaryLiteralValue0, 4, NULL_DEREFERENCE, B1, ERROR, [start of procedure nilInDictionaryLiteralValue0] diff --git a/infer/tests/codetoanalyze/objc/biabduction/npe/UpdateDict.m b/infer/tests/codetoanalyze/objc/biabduction/npe/UpdateDict.m index e6bb67008cf..2d70f357400 100644 --- a/infer/tests/codetoanalyze/objc/biabduction/npe/UpdateDict.m +++ b/infer/tests/codetoanalyze/objc/biabduction/npe/UpdateDict.m @@ -7,7 +7,7 @@ #import -void update_dict_with_null() { +void update_dict_with_null_FN() { NSMutableDictionary* mDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:@"Matt", @"firstName", @@ -44,7 +44,7 @@ void update_dict_without_null() { mDict[@"firstName"] = @"Dulma"; } -void update_array_with_null() { +void update_array_with_null_FN() { NSMutableArray* array = [NSMutableArray arrayWithObjects:@"Dulma", @"Rodriguez", nil]; NSUInteger idx = 0; @@ -60,21 +60,21 @@ void update_array_without_null() { array[idx] = newObject; } -void add_nil_to_array() { +void add_nil_to_array_FN() { NSMutableArray* array = [NSMutableArray arrayWithObjects:@"Dulma", @"Rodriguez", nil]; id str = nil; [array addObject:str]; } -void insert_nil_in_array() { +void insert_nil_in_array_FN() { NSMutableArray* array = [NSMutableArray arrayWithObjects:@"Dulma", @"Rodriguez", nil]; id str = nil; [array insertObject:str atIndex:0]; } -void add_nil_in_dict() { +void add_nil_in_dict_FN() { NSMutableDictionary* mDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:@"Matt", @"firstName", diff --git a/infer/tests/codetoanalyze/objc/biabduction/npe/nil_in_array_literal.m b/infer/tests/codetoanalyze/objc/biabduction/npe/nil_in_array_literal.m index 2054a5ec641..19aafac498c 100644 --- a/infer/tests/codetoanalyze/objc/biabduction/npe/nil_in_array_literal.m +++ b/infer/tests/codetoanalyze/objc/biabduction/npe/nil_in_array_literal.m @@ -66,7 +66,7 @@ - (void)nilInArrayLiteral3 { NSArray* foo = @[ @"aaa", @"bbb", str ]; } -- (NSArray*)nilInArrayWithObject { +- (NSArray*)nilInArrayWithObject_FN { NSString* str = nil; // nil argument in arrayWithObject crashes @@ -88,6 +88,6 @@ int ArrMain() { Arr* a = [Arr alloc]; [a noProblem]; [a nilInArrayLiteral0]; - [a nilInArrayWithObject]; + [a nilInArrayWithObject_FN]; return 0; }